diff options
| author | Carlhuda <carlhuda@engineyard.com> | 2010-02-26 15:04:34 -0800 |
|---|---|---|
| committer | Carlhuda <carlhuda@engineyard.com> | 2010-02-26 15:04:51 -0800 |
| commit | 224c0318bdbaea354bc5ab5c70b267b2a9c3d1c9 (patch) | |
| tree | c1eeebc38cc3213767cd9522f1ec7ae0b9b02ee4 /actionpack | |
| parent | 98f77e08278658ec47c9eb2e8f819d781c1eaebf (diff) | |
| download | rails-224c0318bdbaea354bc5ab5c70b267b2a9c3d1c9.tar.gz rails-224c0318bdbaea354bc5ab5c70b267b2a9c3d1c9.tar.bz2 rails-224c0318bdbaea354bc5ab5c70b267b2a9c3d1c9.zip | |
Remove the :use_defaults check in UrlFor#merge options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/url_for.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb index 1d6da817ed..7004c1aab3 100644 --- a/actionpack/lib/action_dispatch/routing/url_for.rb +++ b/actionpack/lib/action_dispatch/routing/url_for.rb @@ -104,7 +104,7 @@ module ActionDispatch 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 |