diff options
| author | Jonathan Prykop <jonathan@freeside.biz> | 2015-01-31 00:27:01 -0600 |
|---|---|---|
| committer | Jonathan Prykop <jonathan@freeside.biz> | 2015-01-31 00:27:01 -0600 |
| commit | 3d796bf211374d941bda1116ee27a0543045ea8a (patch) | |
| tree | 91817458066d44edbdae45a5dccfbcfe615d4f2d | |
| parent | 66c1457c1820264d0dce794f42cf20be768c6dc3 (diff) | |
#30613 Can't Send E-mail (Additional fixes for upgrade)
| -rw-r--r-- | FS/FS/Upgrade.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm index f84e4e53b..4719caa22 100644 --- a/FS/FS/Upgrade.pm +++ b/FS/FS/Upgrade.pm @@ -70,7 +70,7 @@ sub upgrade_config { upgrade_invoice_from($conf); foreach my $agent (@agents) { - upgrade_invoice_from($conf,$agent->agentnum); + upgrade_invoice_from($conf,$agent->agentnum,1); } my $DIST_CONF = '/usr/local/etc/freeside/default_conf/';#DIST_CONF in Makefile @@ -175,10 +175,10 @@ sub upgrade_overlimit_groups { } sub upgrade_invoice_from { - my ($conf, $agentnum) = @_; + my ($conf, $agentnum, $agentonly) = @_; if ( - (!$conf->config('invoice_from_name',$agentnum)) && - ($conf->config('invoice_from',$agentnum) =~ /\<(.*)\>/) + (!$conf->exists('invoice_from_name',$agentnum,$agentonly)) && + ($conf->config('invoice_from',$agentnum,$agentonly) =~ /\<(.*)\>/) ) { my $realemail = $1; $realemail =~ s/^\s*//; # remove leading spaces |