[freeside-commits] branch FREESIDE_4_BRANCH updated. 650682d61cb09233b106c83d50259e8bd7acee20

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  650682d61cb09233b106c83d50259e8bd7acee20 (commit)
      from  c070aecf4002f55ed83385bd58c1cab6658d6bb3 (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 650682d61cb09233b106c83d50259e8bd7acee20
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Mar 25 12:29:36 2016 -0700

    avoid uninitialized value errors on upgrade

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 2841981..1aae55d 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -203,8 +203,9 @@ sub upgrade_overlimit_groups {
 sub upgrade_invoice_from {
   my ($conf, $agentnum, $agentonly) = @_;
   if (
-      (!$conf->exists('invoice_from_name',$agentnum,$agentonly)) && 
-      ($conf->config('invoice_from',$agentnum,$agentonly) =~ /\<(.*)\>/)
+          ! $conf->exists('invoice_from_name',$agentnum,$agentonly)
+       && $conf->exists('invoice_from',$agentnum,$agentonly)
+       && $conf->config('invoice_from',$agentnum,$agentonly) =~ /\<(.*)\>/
   ) {
     my $realemail = $1;
     $realemail =~ s/^\s*//; # remove leading spaces

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

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