diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2012-02-06 08:01:07 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2012-02-06 08:01:07 -0800 |
| commit | 6e054b16f49cc015ca066093bd5b714fda34d3ab (patch) | |
| tree | fe40cf4620ce154ba282a58671e3ae175855bb30 /actionpack/lib | |
| parent | af7dafff818094a6e02505fe7d6d87add6c2a7e8 (diff) | |
| parent | 837231a8295be63aa3dcbf867b457b2a7aa27386 (diff) | |
| download | rails-6e054b16f49cc015ca066093bd5b714fda34d3ab.tar.gz rails-6e054b16f49cc015ca066093bd5b714fda34d3ab.tar.bz2 rails-6e054b16f49cc015ca066093bd5b714fda34d3ab.zip | |
Merge pull request #4908 from kennyj/fix_3864
Fix url_for method's behavior. GH #3684.
Diffstat (limited to 'actionpack/lib')
| -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 ac4dd7d927..c96999d23f 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -482,7 +482,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 |