diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-24 10:34:09 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-24 10:34:09 -0800 |
| commit | ad6f689bfff5148065a4d7eec1cf5d15da4e41c4 (patch) | |
| tree | 57149665113cafcebc7b1a8b164c623f53c370ab /actionpack/lib/action_dispatch/routing/route_set.rb | |
| parent | d26a166cfbd5c7f67277256aa74e6cc1df7feb77 (diff) | |
| parent | 9b654d47134ef06022861200c2f6e48f8459afb0 (diff) | |
| download | rails-ad6f689bfff5148065a4d7eec1cf5d15da4e41c4.tar.gz rails-ad6f689bfff5148065a4d7eec1cf5d15da4e41c4.tar.bz2 rails-ad6f689bfff5148065a4d7eec1cf5d15da4e41c4.zip | |
Merge pull request #3775 from karevn/master
Please pull my changes - they fix a rare problem with tests framework
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/route_set.rb')
| -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 6100e69d4b..ac4dd7d927 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -598,7 +598,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 |