[freeside-commits] branch master updated. beeeec140a0479d5757031d9ace0e40871d41d22

[Ivan]

The branch, master has been updated
       via  beeeec140a0479d5757031d9ace0e40871d41d22 (commit)
      from  1d4c8f82596a7f3695ba2203e301e497dec9194c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit beeeec140a0479d5757031d9ace0e40871d41d22
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Aug 29 16:00:43 2015 -0700

    eliminate "defined(@array) is deprecated" warnings

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index d6892a9..fafceac 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -1300,8 +1300,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') {
@@ -1543,9 +1542,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' 

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Record.pm |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)