[freeside-commits] branch FREESIDE_4_BRANCH updated. dfcd994a695e10f0868d906ebf9b1002a53e9d02

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  dfcd994a695e10f0868d906ebf9b1002a53e9d02 (commit)
      from  d7b03819e8be84d2801ec94763688df163b41c5e (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 dfcd994a695e10f0868d906ebf9b1002a53e9d02
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Aug 29 16:00:44 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(-)