[freeside-commits] branch master updated. 2b4bb0058f931376a3169d596aa31a17e3f46b04

Ivan ivan at 420.am
Fri Sep 28 12:23:23 PDT 2012


The branch, master has been updated
       via  2b4bb0058f931376a3169d596aa31a17e3f46b04 (commit)
      from  df98a7e3e8173d4e5ad7baa718374f3fb019964c (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 2b4bb0058f931376a3169d596aa31a17e3f46b04
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Sep 28 12:23:22 2012 -0700

    fix unsuspending packages which didn't have a suspend reason, fallout from #6587

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index c34eb43..16adea3 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -1427,7 +1427,8 @@ sub unsuspend {
 
   }
 
-  my $reason = $self->last_cust_pkg_reason('susp')->reason;
+  my $cust_pkg_reason = $self->last_cust_pkg_reason('susp');
+  my $reason = $cust_pkg_reason ? $cust_pkg_reason->reason : '';
 
   my %hash = $self->hash;
   my $inactive = time - $hash{'susp'};
@@ -1457,7 +1458,7 @@ sub unsuspend {
 
   my $unsusp_pkg;
 
-  if ( $reason->unsuspend_pkgpart ) {
+  if ( $reason && $reason->unsuspend_pkgpart ) {
     my $part_pkg = FS::part_pkg->by_key($reason->unsuspend_pkgpart)
       or $error = "Unsuspend package definition ".$reason->unsuspend_pkgpart.
                   " not found.";

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

Summary of changes:
 FS/FS/cust_pkg.pm |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)




More information about the freeside-commits mailing list