X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FRecord.pm;h=053c441f69ebf79219161940f76bcfb7b52cdcf3;hb=d5f138a9521a7b30cd08c4b616b407304a3ebe95;hp=a36256bc737cbc5ae042814b4e357568a95150ca;hpb=9e92a2d4f301066b672be636e51552bbab9d0d27;p=freeside.git

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index a36256bc7..053c441f6 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -1256,7 +1256,7 @@ sub insert {
   }
 
   my $h_sth;
-  if ( defined dbdef->table('h_'. $table) ) {
+  if ( defined( dbdef->table('h_'. $table) ) && ! $no_history ) {
     my $h_statement = $self->_h_statement('insert');
     warn "[debug]$me $h_statement\n" if $DEBUG > 2;
     $h_sth = dbh->prepare($h_statement) or do {
@@ -2974,7 +2974,7 @@ You should generally not have to worry about calling this, as the system handles
 
 sub encrypt {
   my ($self, $value) = @_;
-  my $encrypted;
+  my $encrypted = $value;
 
   if ($conf->exists('encryption')) {
     if ($self->is_encrypted($value)) {