X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FRecord.pm;h=4e0cf8efaec755709ee1bbb0a890a3e1e80a2d97;hb=e310ed83422fee8511df926141a7606676ff1331;hp=2c506ff0f260ccfbfa73064cfd8895513b9970db;hpb=736136102c6fc01fbc9d70358e6e457a09687944;p=freeside.git

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 2c506ff0f..4e0cf8efa 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -1154,7 +1154,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 {
@@ -2924,7 +2924,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)) {