From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 5 Sep 2013 05:33:30 +0000 (-0700)
Subject: defined(@array) is deprecated
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=f8022b72274f5f1177e82fa58265ecf884defb5d;p=freeside.git

defined(@array) is deprecated
---

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index e646b399e..851285283 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -556,8 +556,8 @@ sub qsearch {
     # Check for encrypted fields and decrypt them.
    ## only in the local copy, not the cached object
     no warnings 'deprecated'; # XXX silence the warning for now
-    if ( $conf_encryption
-         && eval 'defined(@FS::'. $table . '::encrypted_fields)' ) {
+    if ( $conf_encryption 
+         && eval '@FS::'. $table . '::encrypted_fields' ) {
       foreach my $record (@return) {
         foreach my $field (eval '@FS::'. $table . '::encrypted_fields') {
           next if $field eq 'payinfo'
@@ -765,8 +765,8 @@ 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)' ) {
+    if ( $conf_encryption 
+         && eval '@FS::'. $table . '::encrypted_fields' ) {
       foreach my $record (@return) {
         foreach my $field (eval '@FS::'. $table . '::encrypted_fields') {
           next if $field eq 'payinfo'
diff --git a/debian/control b/debian/control
index 0e3b4b30c..2d4475c1a 100644
--- a/debian/control
+++ b/debian/control
@@ -84,7 +84,8 @@ Depends: aspell-en,gnupg,ghostscript,gsfonts,gzip,latex-xcolor,
  libhtml-mason-psgihandler-perl,libdate-simple-perl,libsnmp-perl,
  libemail-valid-perl,libparse-fixedlength-perl,libregexp-common-net-cidr-perl,
  libnet-mac-vendor-perl,libnet-https-any-perl,
- libparams-classify-perl (>= 0.013-5.1), libarchive-zip-perl,
+ libparams-classify-perl (>= 0.013-5.1),
+ libcpanel-json-xs-perl, libarchive-zip-perl,
  libtry-tiny-perl, libnumber-phone-perl, libxml-libxml-simple-perl,
  libxml-writer-perl, libio-socket-ssl-perl,
  libmap-splat-perl, libdatetime-format-ical-perl, librest-client-perl,