From aa0017e5590ad0e0aa27bb511968e05cd1524a29 Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com"
 <lpsolit%gmail.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 10 Aug 2005 09:47:58 +0000
Subject: [PATCH] Bug 277466: saved search's old name is used when running a
 search - Patch by Rob Siklos <robzilla@siklos.ca> r=LpSolit,joel a=justdave

git-svn-id: svn://10.0.0.236/trunk@177491 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/buglist.cgi                 | 11 +++++------
 .../en/default/account/prefs/saved-searches.html.tmpl |  2 +-
 .../bugzilla/template/en/default/list/list.html.tmpl  |  3 ++-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mozilla/webtools/bugzilla/buglist.cgi b/mozilla/webtools/bugzilla/buglist.cgi
index 6bc3af291c7..9846d6a3cd3 100755
--- a/mozilla/webtools/bugzilla/buglist.cgi
+++ b/mozilla/webtools/bugzilla/buglist.cgi
@@ -934,12 +934,11 @@ $vars->{'closedstates'} = ['CLOSED', 'VERIFIED', 'RESOLVED'];
 # The list of query fields in URL query string format, used when creating
 # URLs to the same query results page with different parameters (such as
 # a different sort order or when taking some action on the set of query
-# results).  To get this string, we start with the raw URL query string
-# buffer that was created when we initially parsed the URL on script startup,
-# then we remove all non-query fields from it, f.e. the sort order (order)
-# and command type (cmdtype) fields.
-$vars->{'urlquerypart'} = $buffer;
-$vars->{'urlquerypart'} =~ s/(order|cmdtype)=[^&]*&?//g;
+# results).  To get this string, we call the Bugzilla::CGI::canoncalise_query
+# function with a list of elements to be removed from the URL.
+$vars->{'urlquerypart'} = $params->canonicalise_query('order',
+                                                      'cmdtype',
+                                                      'query_based_on');
 $vars->{'order'} = $order;
 
 # The user's login account name (i.e. email address).
diff --git a/mozilla/webtools/bugzilla/template/en/default/account/prefs/saved-searches.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/account/prefs/saved-searches.html.tmpl
index 8827a89ba22..741facc17a7 100644
--- a/mozilla/webtools/bugzilla/template/en/default/account/prefs/saved-searches.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/account/prefs/saved-searches.html.tmpl
@@ -64,7 +64,7 @@
       <tr>
         <td>[% q.name FILTER html %]</td>
         <td>
-          <a href="buglist.cgi?[% q.query FILTER html %]">Run</a>
+          <a href="buglist.cgi?cmdtype=runnamed&amp;namedcmd=[% q.name FILTER url_quote %]">Run</a>
         </td>
         <td>
           <a href="query.cgi?[% q.query FILTER html %]&amp;known_name=[% q.name FILTER url_quote %]">Edit</a>
diff --git a/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl
index 9961bb1b34b..a7b2b344cc9 100644
--- a/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl
@@ -159,7 +159,8 @@
         <a href="buglist.cgi?
         [% urlquerypart FILTER html %]&amp;ctype=ics">iCalendar</a> |
         <a href="colchange.cgi?
-        [% urlquerypart FILTER html %]">Change&nbsp;Columns</a> |
+        [% urlquerypart FILTER html %]&amp;query_based_on=
+          [% defaultsavename OR searchname FILTER html %]">Change&nbsp;Columns</a> |
 
         [% IF bugs.size > 1 && caneditbugs && !dotweak %]
           <a href="buglist.cgi?[% urlquerypart FILTER html %]