diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-22 15:12:03 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-22 15:37:56 -0700 |
| commit | 925bd975663df2e0e8613507a7c95a6945a277ac (patch) | |
| tree | b3ff9a19064db092bc1af18132fb35cddfd86baf /actionpack/lib/action_dispatch/routing/route_set.rb | |
| parent | 0e7e4f798e52d8a71953d49cbfbdf56a4bf70129 (diff) | |
| download | rails-925bd975663df2e0e8613507a7c95a6945a277ac.tar.gz rails-925bd975663df2e0e8613507a7c95a6945a277ac.tar.bz2 rails-925bd975663df2e0e8613507a7c95a6945a277ac.zip | |
use symbol keys for path_parameters
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/route_set.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 8c2e821573..e82957d824 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -707,8 +707,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) + old_params = req.path_parameters + req.path_parameters = old_params.merge params dispatcher = route.app while dispatcher.is_a?(Mapper::Constraints) && dispatcher.matches?(env) do dispatcher = dispatcher.app |