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 06:07:48 -0700 |
| commit | f4ad0ebe7a6b17658bddfeb996e3c34835b75623 (patch) | |
| tree | 0f78d104ab983fd05f9f1ae5dc240237b719a0b6 /actionpack/lib | |
| parent | 8b2cbb3a832101f0e672ee309beca0f8c555b292 (diff) | |
| parent | 641ea6925790771acb6e91b73f9efa6ded834761 (diff) | |
| download | rails-f4ad0ebe7a6b17658bddfeb996e3c34835b75623.tar.gz rails-f4ad0ebe7a6b17658bddfeb996e3c34835b75623.tar.bz2 rails-f4ad0ebe7a6b17658bddfeb996e3c34835b75623.zip | |
Merge pull request #7668 from Draiken/fix_issue_6497
Removing to_shorthand to fix #6497
Diffstat (limited to 'actionpack/lib')
| -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 |