aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-03-18 13:39:58 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-03-18 13:39:58 +0000
commit65704aeacd1e99273f0910b7599d47fd29d52982 (patch)
treebbb6a7fd1d5d338aebea61d86a33e4399935e203
parent2632664f6459b387f64ba473712af049e543beb4 (diff)
downloadrails-65704aeacd1e99273f0910b7599d47fd29d52982.tar.gz
rails-65704aeacd1e99273f0910b7599d47fd29d52982.tar.bz2
rails-65704aeacd1e99273f0910b7599d47fd29d52982.zip
Never return nil from CGI#read_query for compatibility with plain CGI query params parser. Closes #7581.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6446 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb b/actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb
index 3576f99a94..13e4586afa 100644
--- a/actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb
+++ b/actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb
@@ -68,7 +68,7 @@ class CGI #:nodoc:
if env_qs.blank? && !(uri = env_table['REQUEST_URI']).blank?
uri.split('?', 2)[1] || ''
else
- env_qs
+ env_qs || ''
end
end
end