Bug 365753: Incorrect "Cancel" link when moving bug to another product - Patch by...

diff --git a/template/en/default/bug/process/verify-new-product.html.tmpl b/template/en/default/bug/process/verify-new-product.html.tmpl
index 9b73abe97645fb895f9c58dd80cdf772dcc2a779..f248809846d70bd75599ee46e06039f6d53c0ca9 100644 (file)
--- a/template/en/default/bug/process/verify-new-product.html.tmpl
+++ b/template/en/default/bug/process/verify-new-product.html.tmpl
@@ -118,7 +118,16 @@
 
 </form>
 <hr>
-<a href="query.cgi">Cancel and Return to the Search Page</a>
+
+[%# If 'id' is defined, then we are editing a single bug.
+  # Else we are editing several bugs at once. %]
+
+[% IF cgi.param('id') AND cgi.param('id').match('^\d+$') %]
+  [% id = cgi.param('id') %]
+  [% "Cancel and Return to $terms.bug $id" FILTER bug_link(id) FILTER none %]
+[% ELSE %]
+  <a href="buglist.cgi?regetlastlist=1">Cancel and Return to the last search results</a>
+[% END %]
 
 [% PROCESS global/footer.html.tmpl %]