From ce60672342f8da447d24d25f8c0f2049fc81c0c8 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Mon, 19 Nov 2012 21:27:47 -0200 Subject: Correct the use of params options when given to url_for Merge url for tests and add changelog entry for #8233. --- actionpack/lib/action_dispatch/http/url.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_dispatch/http') diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb index 7183939934..bced7d84c0 100644 --- a/actionpack/lib/action_dispatch/http/url.rb +++ b/actionpack/lib/action_dispatch/http/url.rb @@ -28,7 +28,7 @@ module ActionDispatch path = options.delete(:script_name).to_s.chomp("/") path << options.delete(:path).to_s - params = options[:params].is_a?(Hash) ? options[:params] : {} + params = options[:params].is_a?(Hash) ? options[:params] : options.slice(:params) params.reject! { |_,v| v.to_param.nil? } result = build_host_url(options) -- cgit v1.2.3