diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-05-15 21:54:46 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-05-15 21:54:46 +0100 |
| commit | 879493c35fd8d9e12e5cf3e56cd67ff07c3345c5 (patch) | |
| tree | 9615859e1d9a52f71da444b0b7359817bb6acc50 /actionpack/lib/action_controller/cgi_ext | |
| parent | d6ecce66f4e125531875006eea8022b73fe135b5 (diff) | |
| parent | fc02eabf296d6edb74a95174c7322293a54c9492 (diff) | |
| download | rails-879493c35fd8d9e12e5cf3e56cd67ff07c3345c5.tar.gz rails-879493c35fd8d9e12e5cf3e56cd67ff07c3345c5.tar.bz2 rails-879493c35fd8d9e12e5cf3e56cd67ff07c3345c5.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionmailer/lib/action_mailer/base.rb
Diffstat (limited to 'actionpack/lib/action_controller/cgi_ext')
| -rw-r--r-- | actionpack/lib/action_controller/cgi_ext/cookie.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/cgi_ext/cookie.rb b/actionpack/lib/action_controller/cgi_ext/cookie.rb index 3dd374f126..a244e2a39a 100644 --- a/actionpack/lib/action_controller/cgi_ext/cookie.rb +++ b/actionpack/lib/action_controller/cgi_ext/cookie.rb @@ -37,7 +37,7 @@ class CGI #:nodoc: @path = nil else @name = name['name'] - @value = Array(name['value']) + @value = (name['value'].kind_of?(String) ? [name['value']] : Array(name['value'])).delete_if(&:blank?) @domain = name['domain'] @expires = name['expires'] @secure = name['secure'] || false |