diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2012-02-06 08:01:07 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-02-06 17:03:42 +0100 |
| commit | ab44418881c80b757ebd50fb026cae91894fbe6a (patch) | |
| tree | 1abc80daae882689bffcdc39ae8be7aa49619653 /actionpack/lib/action_dispatch/routing/route_set.rb | |
| parent | 93f5361957028f4dc55d1f50fdebe3401aa22d98 (diff) | |
| download | rails-ab44418881c80b757ebd50fb026cae91894fbe6a.tar.gz rails-ab44418881c80b757ebd50fb026cae91894fbe6a.tar.bz2 rails-ab44418881c80b757ebd50fb026cae91894fbe6a.zip | |
Merge pull request #4908 from kennyj/fix_3864
Fix url_for method's behavior. GH #3684.
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/route_set.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index b67a2d01b9..06919518e8 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -489,7 +489,7 @@ module ActionDispatch # if the current controller is "foo/bar/baz" and :controller => "baz/bat" # is specified, the controller becomes "foo/baz/bat" def use_relative_controller! - if !named_route && different_controller? + if !named_route && different_controller? && !controller.start_with?("/") old_parts = current_controller.split('/') size = controller.count("/") + 1 parts = old_parts[0...-size] << controller |