From 3c44df8126d53937d0b8d53a96533f5c8cd01b44 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Mon, 10 Sep 2012 15:14:46 +0800
Subject: Bug 789489: remove double-slashes from bugmail urls

---
 extensions/BMO/template/en/default/email/bugmail.html.tmpl | 8 ++++----
 template/en/default/email/bugmail.html.tmpl                | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/BMO/template/en/default/email/bugmail.html.tmpl b/extensions/BMO/template/en/default/email/bugmail.html.tmpl
index 9a1c71172..9fbefa02b 100644
--- a/extensions/BMO/template/en/default/email/bugmail.html.tmpl
+++ b/extensions/BMO/template/en/default/email/bugmail.html.tmpl
@@ -42,8 +42,8 @@
     <div id="noreply">
       Do not reply to this email. You can add comments to this [% terms.bug %] at
       [%# using the bug_link filter here causes a weird template error %]
-      <a href="[% urlbase FILTER html %]/show_bug.cgi?id=[% bug.id FILTER none %]">
-      [% urlbase FILTER html %]/show_bug.cgi?id=[% bug.id FILTER none %]</a>
+      <a href="[% urlbase FILTER html %]show_bug.cgi?id=[% bug.id FILTER none %]">
+      [% urlbase FILTER html %]show_bug.cgi?id=[% bug.id FILTER none %]</a>
     </div>
     <br>
   [% END %]
@@ -81,7 +81,7 @@
       <ul>
         [% FOREACH ref = referenced_bugs %]
           <li>
-            [<a href="[% urlbase FILTER html %]/show_bug.cgi?id=[% ref.id FILTER none %]">
+            [<a href="[% urlbase FILTER html %]show_bug.cgi?id=[% ref.id FILTER none %]">
             [% terms.Bug %]&nbsp;[% ref.id FILTER none %]</a>] [% ref.short_desc FILTER html %]
           </li>
         [% END %]
@@ -168,7 +168,7 @@
         [% IF change.blocker %]
           [% "${terms.Bug} ${bug.id}" FILTER bug_link(bug, full_url => 1) FILTER none %]
           depends on
-          <a href="[% urlbase FILTER html %]/show_bug.cgi?id=[% change.blocker.id FILTER none %]">
+          <a href="[% urlbase FILTER html %]show_bug.cgi?id=[% change.blocker.id FILTER none %]">
           [% terms.Bug %]&nbsp;[% change.blocker.id FILTER none %]</a>,
           which changed state.<br>
         [% ELSE %]
diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl
index 3d1c291a2..88c935d87 100644
--- a/template/en/default/email/bugmail.html.tmpl
+++ b/template/en/default/email/bugmail.html.tmpl
@@ -48,7 +48,7 @@
       <ul>
       [% FOREACH ref = referenced_bugs %]
         <li>
-          [<a href="[% urlbase FILTER html %]/show_bug.cgi?id=[% ref.id FILTER none %]">
+          [<a href="[% urlbase FILTER html %]show_bug.cgi?id=[% ref.id FILTER none %]">
           [% terms.Bug %]&nbsp;[% ref.id FILTER none %]</a>] [% ref.short_desc FILTER html %]
         </li>
       [% END %]
-- 
cgit v1.2.3-24-g4f1b