diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2019-01-16 10:58:58 -0500 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2019-01-16 11:12:49 -0500 |
| commit | 17e4b49292fb8da8a212e8200e2e94c44aedb788 (patch) | |
| tree | 83cb7afb0e8e1d3cde5e8bc8db973bb7ecb58137 /actionpack/lib/action_dispatch/routing | |
| parent | d67863af390b45ed8dde551071a29b3d347bb8be (diff) | |
| download | rails-17e4b49292fb8da8a212e8200e2e94c44aedb788.tar.gz rails-17e4b49292fb8da8a212e8200e2e94c44aedb788.tar.bz2 rails-17e4b49292fb8da8a212e8200e2e94c44aedb788.zip | |
Revert "Don't handle params option in a special way in url_for helper"
This reverts commit e385e4678fc64be6e176c3bdac6641db9fe48d85.
While this option was undocumented it exists to make possible to pass
parameters to the route helpers that are reserved like `:domain`.
While `url_for(domain: 'foo.com')` would generate a URL in the `foo.com`
domain `url_for(params: { domain: 'foo.com' })` would generate a URL
with `?domain=foo.com`.
Diffstat (limited to 'actionpack/lib/action_dispatch/routing')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/url_for.rb | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 2966c969f6..972953d4f3 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -820,6 +820,10 @@ module ActionDispatch path, params = generate(route_name, path_options, recall) + if options.key? :params + params.merge! options[:params] + end + options[:path] = path options[:script_name] = script_name options[:params] = params diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb index 1a31c7dbb8..fcb8ae296b 100644 --- a/actionpack/lib/action_dispatch/routing/url_for.rb +++ b/actionpack/lib/action_dispatch/routing/url_for.rb @@ -133,6 +133,7 @@ module ActionDispatch # <tt>ActionDispatch::Http::URL.tld_length</tt>, which in turn defaults to 1. # * <tt>:port</tt> - Optionally specify the port to connect to. # * <tt>:anchor</tt> - An anchor name to be appended to the path. + # * <tt>:params</tt> - The query parameters to be appended to the path. # * <tt>:trailing_slash</tt> - If true, adds a trailing slash, as in "/archive/2009/" # * <tt>:script_name</tt> - Specifies application path relative to domain root. If provided, prepends application path. # |