From de80a6c015fb0d63040a111288be26b2118684a4 Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Tue, 26 Jun 2018 16:59:30 -0400
Subject: Revert "Bug 1468848 - Change presentation of show_bug.cgi urls to be
 /bug/ID or /bug/ALIAS."

This reverts commit 404dc5496967203c5f99755340f43d712420446a.
---
 template/en/default/global/header.html.tmpl | 1 -
 template/en/default/setup/strings.txt.pl    | 4 ----
 2 files changed, 5 deletions(-)

(limited to 'template')

diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 492d70a24..153137394 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -137,7 +137,6 @@
 
     <meta name="viewport" content="width=1024">
     <meta name="generator" content="[% terms.Bugzilla _ " " _ constants.BUGZILLA_VERSION FILTER html %]">
-    <base href="[% urlbase FILTER html %]">
     <meta name="bugzilla-global" content="dummy"
         id="bugzilla-global" data-bugzilla="[% json_encode(js_BUGZILLA) FILTER html %]">
     <title>[% title %]</title>
diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl
index fe375400d..8726a8b13 100644
--- a/template/en/default/setup/strings.txt.pl
+++ b/template/en/default/setup/strings.txt.pl
@@ -230,10 +230,6 @@ Only the keys listed below can be overridden.
 END
     localconfig_urlbase => <<'END',
 The URL that is the common initial leading part of all URLs.
-END
-    localconfig_canonical_urlbase => <<'END',
-The URL that is the canonical initial leading part of all URLs.
-This will be the production url for a dev site, for instance.
 END
     localconfig_use_suexec => <<'END',
 Set this to 1 if Bugzilla runs in an Apache SuexecUserGroup environment.
-- 
cgit v1.2.3-24-g4f1b