X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FRecord.pm;h=18624e6c7ca0dbf829a9a3334e7f40d15e51d4a2;hb=f3e8bf05d7781fcaf22ea28d92be236e3f794034;hp=ef0d88d80955725e68e633f29f8102018e0c38d8;hpb=1d091fcec0fb8a78fe5b6a640c67a17a85c06092;p=freeside.git

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index ef0d88d80..18624e6c7 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -204,6 +204,7 @@ sub new {
 
   $self->{'modified'} = 0;
 
+  $self->_simplecache($self->{'Hash'})  if $self->can('_simplecache');
   $self->_cache($self->{'Hash'}, shift) if $self->can('_cache') && @_;
 
   $self;
@@ -1163,8 +1164,7 @@ sub insert {
   my $table = $self->table;
   
   # Encrypt before the database
-  if (    defined(eval '@FS::'. $table . '::encrypted_fields')
-       && scalar( eval '@FS::'. $table . '::encrypted_fields')
+  if (    scalar( eval '@FS::'. $table . '::encrypted_fields')
        && $conf_encryption
   ) {
     foreach my $field (eval '@FS::'. $table . '::encrypted_fields') {
@@ -1406,9 +1406,8 @@ sub replace {
   
   # Encrypt for replace
   my $saved = {};
-  if (    $conf_encryption
-       && defined(eval '@FS::'. $new->table . '::encrypted_fields')
-       && scalar( eval '@FS::'. $new->table . '::encrypted_fields')
+  if (    scalar( eval '@FS::'. $new->table . '::encrypted_fields')
+       && $conf_encryption
   ) {
     foreach my $field (eval '@FS::'. $new->table . '::encrypted_fields') {
       next if $field eq 'payinfo'