summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2018-06-15 02:50:08 +0200
committerKohei Yoshino <kohei.yoshino@gmail.com>2018-06-15 02:50:08 +0200
commit404dc5496967203c5f99755340f43d712420446a (patch)
treeb369a872bb1fa58c0ad95e249347dc5f8905e337 /Bugzilla
parent69e02e0576fc834de982ab6fa3d5b77ce7fe472a (diff)
downloadbugzilla-404dc5496967203c5f99755340f43d712420446a.tar.gz
bugzilla-404dc5496967203c5f99755340f43d712420446a.tar.xz
Bug 1468848 - Change presentation of show_bug.cgi urls to be /bug/ID or /bug/ALIAS.
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/Install/Localconfig.pm13
1 files changed, 10 insertions, 3 deletions
diff --git a/Bugzilla/Install/Localconfig.pm b/Bugzilla/Install/Localconfig.pm
index e1a8e0909..f6333f218 100644
--- a/Bugzilla/Install/Localconfig.pm
+++ b/Bugzilla/Install/Localconfig.pm
@@ -164,6 +164,10 @@ use constant LOCALCONFIG_VARS => (
default => _migrate_param( "urlbase", "" ),
},
{
+ name => 'canonical_urlbase',
+ default => '',
+ },
+ {
name => 'attachment_base',
default => _migrate_param( "attachment_base", '' ),
},
@@ -286,13 +290,16 @@ sub _read_localconfig_from_file {
sub read_localconfig {
my ($include_deprecated) = @_;
-
+ my $lc;
if ($ENV{LOCALCONFIG_ENV}) {
- return _read_localconfig_from_env();
+ $lc = _read_localconfig_from_env();
}
else {
- return _read_localconfig_from_file($include_deprecated);
+ $lc = _read_localconfig_from_file($include_deprecated);
}
+ $lc->{canonical_urlbase} //= $lc->{urlbase};
+
+ return $lc;
}
#