diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-19 21:44:04 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-19 21:44:04 -0200 |
| commit | 03ef833b804fe17ff834ac957a300d45bbb24fab (patch) | |
| tree | aab5c1f759ebc4f94025d42911223f697e6d327e /actionpack/lib/action_dispatch | |
| parent | bba8fc4294ca7f7d90c3e64e7fea059b17caef5c (diff) | |
| parent | ce60672342f8da447d24d25f8c0f2049fc81c0c8 (diff) | |
| download | rails-03ef833b804fe17ff834ac957a300d45bbb24fab.tar.gz rails-03ef833b804fe17ff834ac957a300d45bbb24fab.tar.bz2 rails-03ef833b804fe17ff834ac957a300d45bbb24fab.zip | |
Merge branch 'url-for-params'
Fix error when using a non-hash query argument named "params" in `url_for`.
Before:
url_for(params: "") # => undefined method `reject!' for "":String
After:
url_for(params: "") # => http://www.example.com?params=`
Closes #8233
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/url.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb index 9a7e8a5a9c..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] || {} + params = options[:params].is_a?(Hash) ? options[:params] : options.slice(:params) params.reject! { |_,v| v.to_param.nil? } result = build_host_url(options) |