[freeside-commits] branch master updated. f4ee374e9bbb313234278c7231c046f8e07086f0

[Ivan]

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

    avoid uninitialized value errors on upgrade

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 2a480f8..eb2587b 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(-)