[freeside-commits] branch master updated. 4d10679f7b649d9343f74503b14d17fc2831c40f

[Ivan]

The branch, master has been updated
       via  4d10679f7b649d9343f74503b14d17fc2831c40f (commit)
      from  9da190548d79840cbf04c1e2b65dff386ceb2963 (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 4d10679f7b649d9343f74503b14d17fc2831c40f
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Sep 4 22:33:30 2013 -0700

    defined(@array) is deprecated

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 5cecefd..88198dd 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -422,7 +422,7 @@ if ( -e $addl_handler_use_file ) {
     use vars qw($m);
 
     # false laziness w/below
-    if ( defined(@DBIx::Profile::ISA) ) {
+    if ( @DBIx::Profile::ISA ) {
 
       if ( $FS::CurrentUser::CurrentUser->option('show_db_profile') ) {
 
@@ -482,7 +482,7 @@ if ( -e $addl_handler_use_file ) {
     use vars qw($m);
     $m->clear_buffer;
     #false laziness w/above
-    if ( defined(@DBIx::Profile::ISA) ) {
+    if ( @DBIx::Profile::ISA ) {
 
       if ( $FS::CurrentUser::CurrentUser->option('show_db_profile') ) {
 
diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 35240d4..fd03524 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -506,7 +506,7 @@ sub qsearch {
     # Check for encrypted fields and decrypt them.
    ## only in the local copy, not the cached object
     if ( $conf_encryption 
-         && eval 'defined(@FS::'. $table . '::encrypted_fields)' ) {
+         && eval '@FS::'. $table . '::encrypted_fields' ) {
       foreach my $record (@return) {
         foreach my $field (eval '@FS::'. $table . '::encrypted_fields') {
           next if $field eq 'payinfo' 
@@ -715,7 +715,7 @@ sub _from_hashref {
     # Check for encrypted fields and decrypt them.
    ## only in the local copy, not the cached object
     if ( $conf_encryption 
-         && eval 'defined(@FS::'. $table . '::encrypted_fields)' ) {
+         && eval '@FS::'. $table . '::encrypted_fields' ) {
       foreach my $record (@return) {
         foreach my $field (eval '@FS::'. $table . '::encrypted_fields') {
           next if $field eq 'payinfo' 

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

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