diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-19 06:07:48 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-19 10:10:00 -0300 |
| commit | 61d5d2d8a97fd289b81991cd79dca3112e7ca135 (patch) | |
| tree | d8f236d7ed6e7fd26829e0558ee5ddc242d49fee /actionpack/lib/action_dispatch | |
| parent | a82f1e3f5d11c8dfba9f4c911745ec40a7965216 (diff) | |
| download | rails-61d5d2d8a97fd289b81991cd79dca3112e7ca135.tar.gz rails-61d5d2d8a97fd289b81991cd79dca3112e7ca135.tar.bz2 rails-61d5d2d8a97fd289b81991cd79dca3112e7ca135.zip | |
Merge pull request #7668 from Draiken/fix_issue_6497
Removing to_shorthand to fix #6497
Conflicts:
actionpack/CHANGELOG.md
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 40ff69693b..266d2d5fd1 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -166,7 +166,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 |