projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
da9ab0a
)
avoid uninitialized value errors on upgrade
author
Ivan Kohler
<ivan@freeside.biz>
Fri, 25 Mar 2016 19:29:35 +0000
(12:29 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Fri, 25 Mar 2016 19:29:35 +0000
(12:29 -0700)
FS/FS/Upgrade.pm
patch
|
blob
|
history
diff --git
a/FS/FS/Upgrade.pm
b/FS/FS/Upgrade.pm
index
2a480f8
..
eb2587b
100644
(file)
--- 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 (
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
) {
my $realemail = $1;
$realemail =~ s/^\s*//; # remove leading spaces