diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-13 11:01:53 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-13 11:01:53 -0700 |
| commit | 48cce9d39985c834bdd44bfb09ba3c8172ca5a2d (patch) | |
| tree | e10a2d1a0bf594b6f10bb67214c818009534e072 /actionpack/lib | |
| parent | ca9fd76c2e61574ca96834674599085c8c9db2b4 (diff) | |
| download | rails-48cce9d39985c834bdd44bfb09ba3c8172ca5a2d.tar.gz rails-48cce9d39985c834bdd44bfb09ba3c8172ca5a2d.tar.bz2 rails-48cce9d39985c834bdd44bfb09ba3c8172ca5a2d.zip | |
just merge instead of dup and merge
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 845ccb5f94..351079acc0 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -171,8 +171,7 @@ module ActionDispatch def call(t, args) if args.size == arg_size && !args.last.is_a?(Hash) && optimize_routes_generation?(t) - options = @options.dup - options.merge!(t.url_options) + options = @options.merge t.url_options options[:path] = optimized_helper(args) ActionDispatch::Http::URL.url_for(options) else |