Permalink
Browse files

Remove the :use_defaults check in UrlFor#merge options

  • Loading branch information...
1 parent 98f77e0 commit 224c0318bdbaea354bc5ab5c70b267b2a9c3d1c9 Carlhuda committed Feb 26, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 actionpack/lib/action_dispatch/routing/url_for.rb
@@ -104,7 +104,7 @@ def url_options
end
def merge_options(options) #:nodoc:
- if options.delete(:use_defaults) != false && respond_to?(:default_url_options) && (defaults = default_url_options(options))
+ if respond_to?(:default_url_options) && (defaults = default_url_options(options))
defaults.merge(options)
else
options

0 comments on commit 224c031

Please sign in to comment.