diff options
| author | Arthur Nogueira Neves <github@arthurnn.com> | 2015-11-26 16:10:46 -0500 |
|---|---|---|
| committer | Arthur Nogueira Neves <github@arthurnn.com> | 2015-11-26 16:10:46 -0500 |
| commit | 9afb0b9c432f6987a59b44c2fff15785b5fd5784 (patch) | |
| tree | 91c94f15998f1038ad8637eab23b5dd434c5a44a /actionpack/lib | |
| parent | 52141d365805f6433c9adf272aa6c19e3049147e (diff) | |
| parent | e6e056c2c141ec94eb8e79a30ee766f77fdaf30d (diff) | |
| download | rails-9afb0b9c432f6987a59b44c2fff15785b5fd5784.tar.gz rails-9afb0b9c432f6987a59b44c2fff15785b5fd5784.tar.bz2 rails-9afb0b9c432f6987a59b44c2fff15785b5fd5784.zip | |
Merge pull request #21241 from pdg137/master
In url_for, never append ? when the query string is empty anyway.
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/url.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb index 92b10b6d3b..37f41ae988 100644 --- a/actionpack/lib/action_dispatch/http/url.rb +++ b/actionpack/lib/action_dispatch/http/url.rb @@ -81,7 +81,8 @@ module ActionDispatch def add_params(path, params) params = { params: params } unless params.is_a?(Hash) params.reject! { |_,v| v.to_param.nil? } - path << "?#{params.to_query}" unless params.empty? + query = params.to_query + path << "?#{query}" unless query.empty? end def add_anchor(path, anchor) |