[freeside-commits] branch FREESIDE_3_BRANCH updated. 547606a9623bd76bc9e2c832e8de758a05bbb6f4

[Ivan Kohler]

The branch, FREESIDE_3_BRANCH has been updated
       via  547606a9623bd76bc9e2c832e8de758a05bbb6f4 (commit)
      from  65eadf4357813f39cbab1734a8198d48c1ba68c6 (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 547606a9623bd76bc9e2c832e8de758a05bbb6f4
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jan 24 16:22:26 2018 -0800

    no need for errors decrypting inadvertantly encrypted payinfo to be fatal, RT#76385

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 576cdf072..e729896b3 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -311,7 +311,10 @@ sub upgrade {
       });
       foreach my $object ( @objects ) {
           my $payinfo = $object->decrypt($object->payinfo);
-          die "error decrypting payinfo" if $payinfo eq $object->payinfo;
+          if ( $payinfo eq $object->payinfo ) {
+            warn "error decrypting payinfo for $table: $payinfo\n";
+            next;
+          }
           $object->payinfo($payinfo);
           my $error = $object->replace;
           die $error if $error;

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

Summary of changes:
 FS/FS/Upgrade.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)