diff options
| author | Luiz Felipe <luiz.felipe.gp@gmail.com> | 2012-09-17 11:13:45 -0300 |
|---|---|---|
| committer | Luiz Felipe <luiz.felipe.gp@gmail.com> | 2012-09-19 08:02:37 -0300 |
| commit | 641ea6925790771acb6e91b73f9efa6ded834761 (patch) | |
| tree | c77176500f6dff0778c492aae744110a2e7916d9 /actionpack/lib/action_dispatch | |
| parent | 731d8095355225a9777922c92b453b0c9c7e8e03 (diff) | |
| download | rails-641ea6925790771acb6e91b73f9efa6ded834761.tar.gz rails-641ea6925790771acb6e91b73f9efa6ded834761.tar.bz2 rails-641ea6925790771acb6e91b73f9efa6ded834761.zip | |
Removing to_shorthand from default_controller_and_action. Fixes #6497
When using shortcut routes inside an engine the "to_shorthand" variable
is set to true, causing the module scope of the route to not be applied.
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index ddb34a2394..49afa01d25 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -182,7 +182,7 @@ module ActionDispatch controller ||= default_controller action ||= default_action - unless controller.is_a?(Regexp) || to_shorthand + unless controller.is_a?(Regexp) controller = [@scope[:module], controller].compact.join("/").presence end |