never merge url options in to the first data hash

if you want options, don't mix them with the first hash, just pass them
all in with the second hash

1 files changed, 1 insertions, 1 deletions

diff --git a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
index cfd33d1f31..dd2cbdcddc 100644
--- a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
+++ b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
@@ -136,7 +136,7 @@ module ActionDispatch
 
         url_options = options.except(:action, :routing_type)
         unless url_options.empty?
-          args.last.kind_of?(Hash) ? args.last.merge!(url_options) : args << url_options
+          args << url_options
         end
 
         args.collect! { |a| convert_to_model(a) }