diff options
| author | Tobias Lütke <tobias.luetke@gmail.com> | 2006-02-04 22:04:19 +0000 |
|---|---|---|
| committer | Tobias Lütke <tobias.luetke@gmail.com> | 2006-02-04 22:04:19 +0000 |
| commit | 28cee08fa440dfc9a9b73a4e9c16ca5d1db2fdbb (patch) | |
| tree | d59e302bb41d62be61082cb02926289a66c6c818 /actionpack/lib/action_controller | |
| parent | 6fa5b7b304ae9d4a56232e436feec8cc691ad92a (diff) | |
| download | rails-28cee08fa440dfc9a9b73a4e9c16ca5d1db2fdbb.tar.gz rails-28cee08fa440dfc9a9b73a4e9c16ca5d1db2fdbb.tar.bz2 rails-28cee08fa440dfc9a9b73a4e9c16ca5d1db2fdbb.zip | |
fixed small bug in routing which caused the traverse_to_controller mechanism to drop out on
Multi::Nested::Controllers
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3538 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/routing.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index 47bf3c9d87..2ad8534b15 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -244,7 +244,7 @@ module ActionController mod = suppress(NameError) do next_mod = eval("mod::#{mod_name}", nil, __FILE__, __LINE__) # Check that we didn't get a module from a parent namespace - (mod == Object || next_mod.name == "#{mod.name}::#{controller_name}") ? next_mod : nil + (mod == Object || next_mod.name == "#{mod.name}::#{mod_name}") ? next_mod : nil end raise RoutingError, "Cannot find controller: Dropped out at #{segments[start_at..index] * '/'}" unless mod |