Bug 369933: Use Bugzilla::Util::correct_urlbase() everywhere in templates to get the correct URL to the Bugzilla installation - Patch by Alex Eiser <aeiser@arc.nasa.gov> r/a=LpSolit

5 files changed, 9 insertions, 9 deletions

diff --git a/template/en/default/email/newchangedmail.txt.tmpl b/template/en/default/email/newchangedmail.txt.tmpl
index cbe162ed3..ba24dc1dd 100644
--- a/template/en/default/email/newchangedmail.txt.tmpl
+++ b/template/en/default/email/newchangedmail.txt.tmpl
@@ -38,12 +38,12 @@ X-Bugzilla-Target-Milestone: [% targetmilestone %]
 X-Bugzilla-Changed-Fields: [% changedfields %]
 [%+ threadingmarker %]
 
-[%+ Param('urlbase') %]show_bug.cgi?id=[% bugid %]
+[%+ urlbase %]show_bug.cgi?id=[% bugid %]
 
 [%+ diffs %]
 
 -- 
-Configure bugmail: [% Param('urlbase') %]userprefs.cgi?tab=email
+Configure bugmail: [% urlbase %]userprefs.cgi?tab=email
 ------- You are receiving this mail because: -------
 [% FOREACH relationship = reasons %]
   [% SWITCH relationship %]
diff --git a/template/en/default/email/sanitycheck.txt.tmpl b/template/en/default/email/sanitycheck.txt.tmpl
index fd5b9151b..97b1c0cd1 100644
--- a/template/en/default/email/sanitycheck.txt.tmpl
+++ b/template/en/default/email/sanitycheck.txt.tmpl
@@ -25,7 +25,7 @@ To: [% addressee %]
 Subject: [[% terms.Bugzilla %]] Sanity Check Results
 X-Bugzilla-Type: sanitycheck
 
-[%+ Param('urlbase') %]sanitycheck.cgi
+[%+ urlbase %]sanitycheck.cgi
 
 Below can you read the sanity check results.
 [% IF error_found %]
diff --git a/template/en/default/email/sudo.txt.tmpl b/template/en/default/email/sudo.txt.tmpl
index 758c67b02..0c01bef4f 100644
--- a/template/en/default/email/sudo.txt.tmpl
+++ b/template/en/default/email/sudo.txt.tmpl
@@ -41,4 +41,4 @@ X-Bugzilla-Type: admin
 
     If you feel that this action was inappropiate, please contact 
 [%+ Param("maintainer") %].  For more information on this feature, 
-visit <[% Param("urlbase") %]page.cgi?id=sudo.html>.
+visit <[% urlbase %]page.cgi?id=sudo.html>.
diff --git a/template/en/default/email/votes-removed.txt.tmpl b/template/en/default/email/votes-removed.txt.tmpl
index 6bf2afd8c..69ad2b962 100644
--- a/template/en/default/email/votes-removed.txt.tmpl
+++ b/template/en/default/email/votes-removed.txt.tmpl
@@ -35,5 +35,5 @@ Some or all of your votes have been removed from [% terms.bug %] [%+ bugid %].
 Reason: [% reason %]
 
 
-[% Param("urlbase") %]show_bug.cgi?id=[% bugid %]
+[% urlbase %]show_bug.cgi?id=[% bugid %]
 
diff --git a/template/en/default/email/whine.txt.tmpl b/template/en/default/email/whine.txt.tmpl
index 764b581e8..57f2d13c5 100644
--- a/template/en/default/email/whine.txt.tmpl
+++ b/template/en/default/email/whine.txt.tmpl
@@ -28,7 +28,7 @@ X-Bugzilla-Type: whine
 [This e-mail has been automatically generated.]
 
 You have one or more [% terms.bugs %] assigned to you in the [% terms.Bugzilla %] 
-[% terms.bug %] tracking system ([% Param("urlbase") %]) that require
+[% terms.bug %] tracking system ([% urlbase %]) that require
 attention.
 
 All of these [% terms.bugs %] are in the [% get_status("NEW") %] or
@@ -50,10 +50,10 @@ Generally, this means one of three things:
 To get a list of all [% get_status("NEW") %]/[% get_status("REOPENED") %] [%+ terms.bugs %], you can use this URL (bookmark
 it if you like!):
 
- [% Param("urlbase") %]buglist.cgi?bug_status=NEW&bug_status=REOPENED&assigned_to=[% email %]
+ [% urlbase %]buglist.cgi?bug_status=NEW&bug_status=REOPENED&assigned_to=[% email %]
 
 Or, you can use the general query page, at 
-[%+ Param("urlbase") %]query.cgi
+[%+ urlbase %]query.cgi
 
 Appended below are the individual URLs to get to all of your [% get_status("NEW") %] [%+ terms.bugs %]
 that haven't been touched for a week or more.
@@ -62,5 +62,5 @@ You will get this message once a day until you've dealt with these [% terms.bugs
 
 [% FOREACH bug = bugs %]
  [%+ bug.summary %]
-    -> [% Param("urlbase") %]show_bug.cgi?id=[% bug.id %]
+    -> [% urlbase %]show_bug.cgi?id=[% bug.id %]
 [% END %]