diff options
| author | José Valim <jose.valim@gmail.com> | 2009-07-02 10:25:18 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-07-02 10:25:18 +0200 |
| commit | 1c265da1db934ffab0a5151dc7beeed3ef1bbabb (patch) | |
| tree | e3e2af724e0fe70b9bceb09a26a179fadf76b992 /actionpack/lib/action_controller/routing | |
| parent | 4739f0ff5d5c013eb33aed7f371a3a91d3fca292 (diff) | |
| parent | 8bb510f6c1e235f5fb1cf9e79af759a429a497b0 (diff) | |
| download | rails-1c265da1db934ffab0a5151dc7beeed3ef1bbabb.tar.gz rails-1c265da1db934ffab0a5151dc7beeed3ef1bbabb.tar.bz2 rails-1c265da1db934ffab0a5151dc7beeed3ef1bbabb.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/routing')
| -rw-r--r-- | actionpack/lib/action_controller/routing/route_set.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/routing/route_set.rb b/actionpack/lib/action_controller/routing/route_set.rb index 45ad8a3a3b..87b4b0571c 100644 --- a/actionpack/lib/action_controller/routing/route_set.rb +++ b/actionpack/lib/action_controller/routing/route_set.rb @@ -436,7 +436,7 @@ module ActionController def recognize(request) params = recognize_path(request.path, extract_request_environment(request)) request.path_parameters = params.with_indifferent_access - "#{params[:controller].camelize}Controller".constantize + "#{params[:controller].to_s.camelize}Controller".constantize end def recognize_path(path, environment={}) |