aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/cgi_process.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-06-23 00:13:40 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-06-23 00:13:40 +0000
commit9159489872a1dd2038888b72b6990484a24ccad8 (patch)
tree9828e78b965dc1c135d4eb2010bd7e90ba5a005f /actionpack/lib/action_controller/cgi_process.rb
parent3bf3042a6cd29fd3ccc18541e84ea8ca5c791889 (diff)
downloadrails-9159489872a1dd2038888b72b6990484a24ccad8.tar.gz
rails-9159489872a1dd2038888b72b6990484a24ccad8.tar.bz2
rails-9159489872a1dd2038888b72b6990484a24ccad8.zip
Don't mistakenly interpret the request uri as the query string. Closes #8731.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7084 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/cgi_process.rb')
-rw-r--r--actionpack/lib/action_controller/cgi_process.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb
index edb7fb38d8..fa7afd4197 100644
--- a/actionpack/lib/action_controller/cgi_process.rb
+++ b/actionpack/lib/action_controller/cgi_process.rb
@@ -47,11 +47,11 @@ module ActionController #:nodoc:
end
def query_string
- qs = @cgi.query_string
+ qs = @cgi.query_string if @cgi.respond_to?(:query_string)
if !qs.blank?
qs
elsif uri = @env['REQUEST_URI']
- uri.split('?', 2).last
+ uri.split('?', 2)[1] || ''
else
@env['QUERY_STRING'] || ''
end