[freeside-commits] branch FREESIDE_3_BRANCH updated. 5044079396b9bef09dd498a0e64a4f20046318b8

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  5044079396b9bef09dd498a0e64a4f20046318b8 (commit)
       via  0db7afaa7079e7a997d1309715d371a0d8ad279b (commit)
       via  407b4dbfd15fb120a06a9c2da4fe77137aebdacf (commit)
      from  21c0c6fb8fef10843651a81152b02f1c174b3893 (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 5044079396b9bef09dd498a0e64a4f20046318b8
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Aug 29 16:00:46 2015 -0700

    eliminate "defined(@array) is deprecated" warnings

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index ef0d88d..671d16c 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -1163,8 +1163,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 +1405,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' 

commit 0db7afaa7079e7a997d1309715d371a0d8ad279b
Merge: 407b4db 21c0c6f
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Aug 29 16:00:06 2015 -0700

    Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH


commit 407b4dbfd15fb120a06a9c2da4fe77137aebdacf
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Aug 29 15:52:12 2015 -0700

    quiet "Posible precedence issue with control flow operator" warning under 5.20+ (deb 8)

diff --git a/FS/FS/qual.pm b/FS/FS/qual.pm
index 07878e9..04ee0e1 100644
--- a/FS/FS/qual.pm
+++ b/FS/FS/qual.pm
@@ -180,7 +180,7 @@ sub part_export {
     my $self = shift;
     if ( $self->exportnum ) {
 	return qsearchs('part_export', { exportnum => $self->exportnum } )
-		or die 'invalid exportnum';
+		|| die 'invalid exportnum';
     }
     '';
 }

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

Summary of changes:
 FS/FS/Record.pm |    8 +++-----
 FS/FS/qual.pm   |    2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)