diff options
| author | karevn <karev.n@gmail.com> | 2011-11-28 00:55:50 +0600 |
|---|---|---|
| committer | karevn <karev.n@gmail.com> | 2011-11-28 00:55:50 +0600 |
| commit | 9b654d47134ef06022861200c2f6e48f8459afb0 (patch) | |
| tree | 6e4560aa505df84af408bba0e69a665a0ce21bc3 /actionpack/lib/action_dispatch | |
| parent | 71b387d91e7d74ad3b90db7b9b9264936d6d3c4d (diff) | |
| download | rails-9b654d47134ef06022861200c2f6e48f8459afb0.tar.gz rails-9b654d47134ef06022861200c2f6e48f8459afb0.tar.bz2 rails-9b654d47134ef06022861200c2f6e48f8459afb0.zip | |
Fix: when using subdomains and constraints, request params were not passed to constraints callback
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 2bcde16110..740d5bb73f 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -588,7 +588,8 @@ module ActionDispatch params[key] = URI.parser.unescape(value) end end - + old_params = env[::ActionDispatch::Routing::RouteSet::PARAMETERS_KEY] + env[::ActionDispatch::Routing::RouteSet::PARAMETERS_KEY] = (old_params || {}).merge(params) dispatcher = route.app while dispatcher.is_a?(Mapper::Constraints) && dispatcher.matches?(env) do dispatcher = dispatcher.app |