Bug 470214: Query sorting by multiple columns sometimes loses a column

r=ghendricks a=LpSolit

diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl
index 11ec4c589798494df7635d33ba07bf57b887fd8f..fcbba3ab17e45d3604b49fa3d336d10c05f79527 100644 (file)
--- a/template/en/default/list/table.html.tmpl
+++ b/template/en/default/list/table.html.tmpl
@@ -134,10 +134,9 @@
     [% IF (om = order.match("$id( DESC)?")) %]
       [% desc = ' DESC' IF NOT om.0 %]
     [% END %]
-    [% order = order.remove("\\b$id( DESC)?(,\\s*|\$)") %]
     <a href="buglist.cgi?[% urlquerypart FILTER html %]&amp;order=
       [% id FILTER url_quote %][% desc FILTER url_quote %]
-      [% ",$order" FILTER url_quote IF order %]
+      [% ',' _ order.remove("\\b$id( DESC)?(,\\s*|\$)") FILTER url_quote IF order %]
       [%-#%]&amp;query_based_on=
       [% defaultsavename OR searchname FILTER url_quote %]">
         [%- abbrev.$id.title || field_descs.$id || column.title -%]</a>