diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-10 10:00:20 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-10 10:01:06 -0800 |
| commit | 73fcbaaa788f781a15d1fe7f8fae2e4b53c799fa (patch) | |
| tree | 46bc9c3e044480b200354a755e3b4b0487f9b112 /actionpack/lib/action_dispatch/routing/route_set.rb | |
| parent | 6d17b3677886438b208326df75b7d7ad6e7eadb4 (diff) | |
| download | rails-73fcbaaa788f781a15d1fe7f8fae2e4b53c799fa.tar.gz rails-73fcbaaa788f781a15d1fe7f8fae2e4b53c799fa.tar.bz2 rails-73fcbaaa788f781a15d1fe7f8fae2e4b53c799fa.zip | |
Merge pull request #4988 from kennyj/fix_4720-3
Fix GH #4720. Routing problem with nested namespace and already camelized controller option.
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/route_set.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 5 |
1 files changed, 5 insertions, 0 deletions
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 |