diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2018-06-26 22:59:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-26 22:59:30 +0200 |
| commit | de80a6c015fb0d63040a111288be26b2118684a4 (patch) | |
| tree | 7829af10f8a3b844c8f7ab0018194c170f41bd4e /Bugzilla/Install | |
| parent | a685e15218fbe7d26015a579c96caf7de783732d (diff) | |
| download | bugzilla-de80a6c015fb0d63040a111288be26b2118684a4.tar.gz bugzilla-de80a6c015fb0d63040a111288be26b2118684a4.tar.xz | |
Revert "Bug 1468848 - Change presentation of show_bug.cgi urls to be /bug/ID or /bug/ALIAS."
This reverts commit 404dc5496967203c5f99755340f43d712420446a.
Diffstat (limited to 'Bugzilla/Install')
| -rw-r--r-- | Bugzilla/Install/Localconfig.pm | 13 |
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; } # |