diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-07-15 15:15:25 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-07-15 15:15:25 -0300 |
| commit | 4f21269c0aa1ea9991cf4864b40d9918ed6e8ba9 (patch) | |
| tree | 3074c97f3e8583d88fe8c3fda93efc82a6cdb7c7 /actionpack/lib/action_dispatch | |
| parent | 64c1264419f766a306eba0418c1030b87489ea67 (diff) | |
| parent | 84b861f1aae1b63525dcac99b3df2100b6739010 (diff) | |
| download | rails-4f21269c0aa1ea9991cf4864b40d9918ed6e8ba9.tar.gz rails-4f21269c0aa1ea9991cf4864b40d9918ed6e8ba9.tar.bz2 rails-4f21269c0aa1ea9991cf4864b40d9918ed6e8ba9.zip | |
Merge pull request #20868 from sikachu/params-not-inherited-from-hwia
Make AC::Parameters not inherited from Hash
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/url_for.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb index 8379d089df..967bbd62f8 100644 --- a/actionpack/lib/action_dispatch/routing/url_for.rb +++ b/actionpack/lib/action_dispatch/routing/url_for.rb @@ -171,6 +171,10 @@ module ActionDispatch route_name = options.delete :use_route _routes.url_for(options.symbolize_keys.reverse_merge!(url_options), route_name) + when ActionController::Parameters + route_name = options.delete :use_route + _routes.url_for(options.to_unsafe_h.symbolize_keys. + reverse_merge!(url_options), route_name) when String options when Symbol |