From 9159489872a1dd2038888b72b6990484a24ccad8 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sat, 23 Jun 2007 00:13:40 +0000 Subject: 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 --- actionpack/lib/action_controller/cgi_process.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'actionpack/lib/action_controller') 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 -- cgit v1.2.3