aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/cgi_ext
diff options
context:
space:
mode:
authorRich Cavanaugh <cavanaugh@fatjam.com>2008-05-12 15:25:56 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2008-05-12 15:26:19 -0700
commita425cd147363a0e8d7e17177ef252dd760197f15 (patch)
treed992a97129c45fe67028e8ba372164cd4ca03568 /actionpack/lib/action_controller/cgi_ext
parentcde6a259bf46cdaf1f2fe5fdeb84478ca8fc3046 (diff)
downloadrails-a425cd147363a0e8d7e17177ef252dd760197f15.tar.gz
rails-a425cd147363a0e8d7e17177ef252dd760197f15.tar.bz2
rails-a425cd147363a0e8d7e17177ef252dd760197f15.zip
Don't double-escape cookie store data. Don't split cookie values with newlines into an array. [#130 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'actionpack/lib/action_controller/cgi_ext')
-rw-r--r--actionpack/lib/action_controller/cgi_ext/cookie.rb2
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..e35bab5f5a 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'])
@domain = name['domain']
@expires = name['expires']
@secure = name['secure'] || false