summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 056b80b4c..037c4b3f2 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');
}