diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-08-23 01:21:43 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-08-23 01:21:43 +0200 |
| commit | b587bfd589cbb4469b9e49bfdd90f033d14adc9a (patch) | |
| tree | d5fd06c8a1238dca62d3f3b512a6f19b63bc4b0e /actionpack/lib/action_dispatch/http | |
| parent | 9992a1a4bff1dd666298866c283ba18832da0914 (diff) | |
| parent | 8d1ee434da3348089daa497980d1e24837ee8be6 (diff) | |
| download | rails-b587bfd589cbb4469b9e49bfdd90f033d14adc9a.tar.gz rails-b587bfd589cbb4469b9e49bfdd90f033d14adc9a.tar.bz2 rails-b587bfd589cbb4469b9e49bfdd90f033d14adc9a.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'actionpack/lib/action_dispatch/http')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/parameters.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/parameters.rb b/actionpack/lib/action_dispatch/http/parameters.rb index add8cab2ab..5e1a2405f7 100644 --- a/actionpack/lib/action_dispatch/http/parameters.rb +++ b/actionpack/lib/action_dispatch/http/parameters.rb @@ -15,14 +15,14 @@ module ActionDispatch alias :params :parameters def path_parameters=(parameters) #:nodoc: - @env.delete("action_dispatch.request.symbolized_path_parameters") + @_symbolized_path_params = nil @env.delete("action_dispatch.request.parameters") @env["action_dispatch.request.path_parameters"] = parameters end # The same as <tt>path_parameters</tt> with explicitly symbolized keys. def symbolized_path_parameters - @env["action_dispatch.request.symbolized_path_parameters"] ||= path_parameters.symbolize_keys + @_symbolized_path_params ||= path_parameters.symbolize_keys end # Returns a hash with the \parameters used to form the \path of the request. |
