diff options
-rw-r--r-- | app/controllers/general_controller.rb | 2 | ||||
-rw-r--r-- | config/routes.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index faf34aa04..34870bd42 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -109,7 +109,7 @@ 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. - combined = params[:combined] + combined = params[:combined].split("/") @sortby = nil @bodies = @requests = @users = true if combined.size > 0 && (['advanced'].include?(combined[-1])) diff --git a/config/routes.rb b/config/routes.rb index cacdce08e..7288b1a0d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -28,7 +28,7 @@ ActionController::Routing::Routes.draw do |map| # and dots and other characters that can appear in search query. So we sort it all # out in the controller. general.search_general '/search/*combined/all', :action => 'search', :view => 'all' - general.search_general '/search/*combined', :action => 'search' + general.search_general '/search(/*combined)', :action => 'search' general.advanced_search '/advancedsearch', :action => 'search_redirect', :advanced => true general.random_request '/random', :action => 'random_request' |