Bug 1272548 - bug link in header broken if format param specified

diff --git a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
index 25f785a9d81058f80c6d3fae36d261a54253fd8d..06b6c801d5d183bcb057b30dee9c07b1e9eda131 100644 (file)
--- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
@@ -166,9 +166,12 @@
         view_only = 1
     %]
       <div id="field-value-bug_id">
-        <a id="this-bug" href="show_bug.cgi?id=[% bug.id FILTER none %]
-                [%~ '&amp;format=' _ cgi.param("format") FILTER uri IF cgi.param("format") %]"
-        >
+        [% this_bug_href = "show_bug.cgi?id=$bug.id" %]
+        [% IF cgi.param("format") %]
+          [% format_uri = cgi.param("format") FILTER uri %]
+          [% this_bug_href = this_bug_href _ "&format=" _ format_uri %]
+        [% END %]
+        <a id="this-bug" href="[% this_bug_href FILTER html %]">
           [%~ terms.Bug _ " " _ bug.id FILTER none ~%]
         </a>
         [% IF bug.alias %]