From 224c0318bdbaea354bc5ab5c70b267b2a9c3d1c9 Mon Sep 17 00:00:00 2001 From: Carlhuda Date: Fri, 26 Feb 2010 15:04:34 -0800 Subject: Remove the :use_defaults check in UrlFor#merge options --- actionpack/lib/action_dispatch/routing/url_for.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_dispatch') 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 -- cgit v1.2.3