summaryrefslogtreecommitdiff
path: root/FS
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2013-09-11 01:41:26 -0700
committerIvan Kohler <ivan@freeside.biz>2013-09-11 01:41:26 -0700
commit6ebb1fc69db49b6aaafd28b15db3a5aab07b1ac0 (patch)
tree4893c492ad785d3a1c0a2a389a4a10ff9f6f5495 /FS
parent47d47f7b4a77761d5617a64212d6b1460fa27adf (diff)
avoid noise on upgrades
Diffstat (limited to 'FS')
-rw-r--r--FS/FS/Upgrade.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index cda3198eb..21dda0959 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -86,10 +86,10 @@ sub upgrade_config {
# if there's a USPS tools login, assume that's the standardization method
# you want to use
- if ( length($conf->config('usps_webtools-userid')) > 0 and
- !$conf->exists('address_standardize_method') ) {
- $conf->set('address_standardize_method', 'usps');
- }
+ $conf->set('address_standardize_method', 'usps')
+ if $conf->exists('usps_webtools-userid')
+ && length($conf->config('usps_webtools-userid')) > 0
+ && ! $conf->exists('address_standardize_method');
}