Bug 283424 : URL with extra space created in enter_bug.cgi when using a format

Patch by Havard Wigtil <havardw+bugzilla@pvv.org>   r=wurblzap  a=myk

diff --git a/template/en/default/global/choose-classification.html.tmpl b/template/en/default/global/choose-classification.html.tmpl
index 3bb4be3a8b4f830e2e6dd8b1bcf8ae8079d64e73..b2021f234cc595db92b2e555cb1c6a877f08f9bd 100644 (file)
--- a/template/en/default/global/choose-classification.html.tmpl
+++ b/template/en/default/global/choose-classification.html.tmpl
@@ -36,8 +36,8 @@
   <tr>
     <th align="right" valign="center" height=50>
       <a href="[% target FILTER url_quote %]?classification=__all
-            [% IF cloned_bug_id %]&amp;cloned_bug_id=[% cloned_bug_id FILTER url_quote %][% END %] 
-            [% IF format %]&amp;format=[% format FILTER url_quote %][% END %]">
+            [% IF cloned_bug_id %]&amp;cloned_bug_id=[% cloned_bug_id FILTER url_quote %][% END -%] 
+            [%- IF format %]&amp;format=[% format FILTER url_quote %][% END %]">
       All</a>:
     </th>
 
@@ -49,9 +49,9 @@
   [% IF classifications.$p.size > 0 %]
   <tr>
     <th align="right" valign="top">
-      <a href="[% target FILTER url_quote %]?classification=[% p FILTER url_quote %]
-            [% IF cloned_bug_id %]&amp;cloned_bug_id=[% cloned_bug_id FILTER url_quote %][% END %] 
-            [% IF format %]&amp;format=[% format FILTER url_quote %][% END %]">
+      <a href="[% target FILTER url_quote %]?classification=[% p FILTER url_quote -%]
+            [%- IF cloned_bug_id %]&amp;cloned_bug_id=[% cloned_bug_id FILTER url_quote %][% END -%] 
+            [%- IF format %]&amp;format=[% format FILTER url_quote %][% END %]">
       [% p FILTER html %]</a>:
     </th>
 

diff --git a/template/en/default/global/choose-product.html.tmpl b/template/en/default/global/choose-product.html.tmpl
index da13ee84ff09dc74abce0566f31fa1dab35e9feb..2fdc3b1b738a022817d48c96328ec523e28702f2 100644 (file)
--- a/template/en/default/global/choose-product.html.tmpl
+++ b/template/en/default/global/choose-product.html.tmpl
@@ -42,9 +42,9 @@
 [% FOREACH p = proddesc.keys.sort %]
   <tr>
     <th align="right" valign="top">
-      <a href="[% target %]?product=[% p FILTER url_quote %]
-            [% IF cloned_bug_id %]&amp;cloned_bug_id=[% cloned_bug_id FILTER url_quote %][% END %] 
-            [% IF format %]&amp;format=[% format FILTER url_quote %][% END %]">
+      <a href="[% target %]?product=[% p FILTER url_quote -%]
+            [%- IF cloned_bug_id %]&amp;cloned_bug_id=[% cloned_bug_id FILTER url_quote %][% END -%] 
+            [%- IF format %]&amp;format=[% format FILTER url_quote %][% END %]">
       [% p FILTER html %]</a>:
     </th>