From 4a763a685c4853086743a1e5357f727e6bae8e3b Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Sun, 7 Jan 2007 04:02:32 +0000
Subject: Bug 365753: Incorrect "Cancel" link when moving bug to another
 product - Patch by Frédéric Buclin <LpSolit@gmail.com> r=bkor a=justdave
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/en/default/bug/process/verify-new-product.html.tmpl | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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 9b73abe97..f24880984 100644
--- 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 %]
 
-- 
cgit v1.2.3-24-g4f1b