From 73fcbaaa788f781a15d1fe7f8fae2e4b53c799fa Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Fri, 10 Feb 2012 10:00:20 -0800 Subject: Merge pull request #4988 from kennyj/fix_4720-3 Fix GH #4720. Routing problem with nested namespace and already camelized controller option. --- actionpack/lib/action_dispatch/routing/route_set.rb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'actionpack/lib/action_dispatch/routing') diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 552d472afa..33eb7b0746 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -31,6 +31,7 @@ module ActionDispatch end def prepare_params!(params) + normalize_controller!(params) merge_default_action!(params) split_glob_param!(params) if @glob_param end @@ -66,6 +67,10 @@ module ActionDispatch controller.action(action).call(env) end + def normalize_controller!(params) + params[:controller] = params[:controller].underscore if params.key?(:controller) + end + def merge_default_action!(params) params[:action] ||= 'index' end -- cgit v1.2.3