diff options
| author | Joshua Peek <josh@joshpeek.com> | 2010-01-15 14:53:54 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2010-01-15 14:55:13 -0600 |
| commit | 184ef28f55bb576e1eaebf915f8ce64aa8823e90 (patch) | |
| tree | 66e5867a013947ad31a0713ad2e819387835985d /actionpack/lib/action_dispatch/routing/mapper.rb | |
| parent | ead93c5be5b0f1945b7d0302f1aae4685ee3f2fb (diff) | |
| download | rails-184ef28f55bb576e1eaebf915f8ce64aa8823e90.tar.gz rails-184ef28f55bb576e1eaebf915f8ce64aa8823e90.tar.bz2 rails-184ef28f55bb576e1eaebf915f8ce64aa8823e90.zip | |
Routing method shorthand shouldn't clobber :to options
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/mapper.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 277cb48e50..6ff573443b 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -560,10 +560,10 @@ module ActionDispatch if args.first.is_a?(Symbol) action = args.first if CRUD_ACTIONS.include?(action) - return match("(.:format)", options.merge(:to => action)) + return match("(.:format)", options.reverse_merge(:to => action)) else with_exclusive_name_prefix(action) do - return match("/#{action_path(action, resources_path_names)}(.:format)", options.merge(:to => action)) + return match("/#{action_path(action, resources_path_names)}(.:format)", options.reverse_merge(:to => action)) end end end |