Merge branch 'release/0.5' into develop

1 files changed, 7 insertions, 29 deletions

diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index c715b547d..8ac41b05a 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -86,34 +86,19 @@ class GeneralController < ApplicationController
 
     # Just does a redirect from ?query= search to /query
     def search_redirect
-        if params[:advanced].nil?
-            @query, _ = make_query_from_params
-        else
-            @query, _ = params[:query]
-        end
-        @sortby = params[:sortby]
-        path = request.path.split("/")
-        if path.size > 0 && (['newest', 'described', 'relevant'].include?(path[-1]))
-            @sort_postfix = path.pop
-        end
-        if path.size > 0 && (['bodies', 'requests', 'users', 'all'].include?(path[-1]))
-            @variety_postfix = path.pop
-        end
-        @variety_postfix = "bodies" if @variety_postfix.nil? && !params[:bodies].nil?
-        @variety_postfix = "all" if @variety_postfix.nil?
-        if @variety_postfix != "users"
-            @common_query = get_tags_from_params
-        end
-        [:latest_status, :request_variety, :request_date_after, :request_date_before, :query, :tags].each do |x| 
-            session[x] = params[x]
-        end
+        @query = params.delete(:query)
         if @query.nil? || @query.empty?
             @query = nil
             @page = 1
             @advanced = !params[:advanced].nil?
             render :action => "search"
         else
-            redirect_to search_url(@query, @variety_postfix, @sort_postfix, params[:advanced])
+            query_parts = @query.split("/")
+            if !['bodies', 'requests', 'users', 'all'].include?(query_parts[-1])
+                redirect_to search_url([@query, "all"], params)
+            else                
+                redirect_to search_url(@query, params)
+            end
         end
     end
 
@@ -121,13 +106,6 @@ class GeneralController < ApplicationController
     def search
         # XXX Why is this so complicated with arrays and stuff? Look at the route
         # in config/routes.rb for comments.
-        if !params[:commit].nil?
-            search_redirect
-            return
-        end
-        [:latest_status, :request_variety, :request_date_after, :request_date_before, :query, :tags].each do |x|
-            params[x] = session[x] if params[x].nil?
-        end
         combined = params[:combined]
         @sortby = nil
         @bodies = @requests = @users = true