fixes #1576

The "params[:order] ||= params.delete(:sort)" is to support existing
links using sort.

app/views/artists/_search.html.erb

@@ -12,10 +12,10 @@
       </tr>
 
       <tr>
-        <th><label for="search_sort">Sort</label>
+        <th><label for="search_order">Order</label>
         <td>
           <div class="input">
-            <%= select "search", "sort", [["Date", "date"], ["Name", "name"]], :selected => params[:search][:sort] %>
+            <%= select "search", "order", [["Date", "date"], ["Name", "name"]], :selected => params[:search][:order] %>
           </div>
         </td>
       </tr>

app/views/pools/_search.html.erb

@@ -38,10 +38,10 @@
       </tr>
 
       <tr>
-        <th><label for="search_sort">Order</th>
+        <th><label for="search_order">Order</th>
         <td>
           <div class="input">
-            <%= select "search", "sort", [["Last updated", "updated_at"], ["Name", "name"], ["Recently created", "created_at"], ["Post count", "post_count"]], :selected => params[:search][:sort] %>
+            <%= select "search", "order", [["Last updated", "updated_at"], ["Name", "name"], ["Recently created", "created_at"], ["Post count", "post_count"]], :selected => params[:search][:order] %>
           </div>
         </td>
       </tr>

app/views/tags/_search.html.erb

@@ -21,10 +21,10 @@
       </tr>
 
       <tr>
-        <th><label for="search_sort">Sort</label></th>
+        <th><label for="search_order">Order</label></th>
         <td>
           <div class="input">
-            <%= select "search", "sort", %w(count date name), :selected => params[:search][:sort] %>
+            <%= select "search", "order", %w(count date name), :selected => params[:search][:order] %>
           </div>
         </td>
       </tr>

app/views/wiki_pages/_recent_changes.html.erb

@@ -1,5 +1,5 @@
 <section>
-  <h1>Recent Changes (<%= link_to "all", wiki_pages_path(:sort => "time") %>)</h1>
+  <h1>Recent Changes (<%= link_to "all", wiki_pages_path(:order => "time") %>)</h1>
   <ul>
     <% WikiPage.recent.each do |page| %>
       <li class="category-<%= page.category_name %>"><%= link_to page.pretty_title, wiki_page_path(page) %></li>

app/views/wiki_pages/search.html.erb

@@ -6,8 +6,8 @@
       <%= search_field "body_matches", :label => "Body" %>
 
       <div class="input">
-        <label for="search_sort">Sort</label>
-        <%= select "search", "sort", ["Name", "Date"] %>
+        <label for="search_order">Order</label>
+        <%= select "search", "order", ["Name", "Date"] %>
       </div>
 
       <%= submit_tag "Search" %>