diff options
| author | Rick Olson <technoweenie@gmail.com> | 2008-03-13 03:22:25 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2008-03-13 03:22:25 +0000 |
| commit | 1e0ac3a673a6cc92c1c6c5bc84180afeb60241d9 (patch) | |
| tree | 70fcc886a3ca93a3eb50e322c81bcfe3ce68fb97 /actionpack/lib | |
| parent | 7750afc4c1b6873bf1ee50ca386b9714430be618 (diff) | |
| download | rails-1e0ac3a673a6cc92c1c6c5bc84180afeb60241d9.tar.gz rails-1e0ac3a673a6cc92c1c6c5bc84180afeb60241d9.tar.bz2 rails-1e0ac3a673a6cc92c1c6c5bc84180afeb60241d9.zip | |
Fix more obscure nested parameter hash parsing bug. Closes #10797 [thomas.lee]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9020 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
| -rwxr-xr-x | actionpack/lib/action_controller/request.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb index 9aff733a5c..d817004398 100755 --- a/actionpack/lib/action_controller/request.rb +++ b/actionpack/lib/action_controller/request.rb @@ -682,7 +682,8 @@ module ActionController elsif top.is_a? Hash key = CGI.unescape(key) parent << (@top = {}) if top.key?(key) && parent.is_a?(Array) - return top[key] ||= value + top[key] ||= value + return top[key] else raise ArgumentError, "Don't know what to do: top is #{top.inspect}" end |