summaryrefslogtreecommitdiffstats
path: root/Bugzilla/Install/Localconfig.pm
diff options
context:
space:
mode:
Diffstat (limited to 'Bugzilla/Install/Localconfig.pm')
-rw-r--r--Bugzilla/Install/Localconfig.pm13
1 files changed, 3 insertions, 10 deletions
diff --git a/Bugzilla/Install/Localconfig.pm b/Bugzilla/Install/Localconfig.pm
index f6333f218..e1a8e0909 100644
--- a/Bugzilla/Install/Localconfig.pm
+++ b/Bugzilla/Install/Localconfig.pm
@@ -164,10 +164,6 @@ use constant LOCALCONFIG_VARS => (
default => _migrate_param( "urlbase", "" ),
},
{
- name => 'canonical_urlbase',
- default => '',
- },
- {
name => 'attachment_base',
default => _migrate_param( "attachment_base", '' ),
},
@@ -290,16 +286,13 @@ sub _read_localconfig_from_file {
sub read_localconfig {
my ($include_deprecated) = @_;
- my $lc;
+
if ($ENV{LOCALCONFIG_ENV}) {
- $lc = _read_localconfig_from_env();
+ return _read_localconfig_from_env();
}
else {
- $lc = _read_localconfig_from_file($include_deprecated);
+ return _read_localconfig_from_file($include_deprecated);
}
- $lc->{canonical_urlbase} //= $lc->{urlbase};
-
- return $lc;
}
#