diff options
author | Joshua Peek <josh@joshpeek.com> | 2008-08-19 20:22:27 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2008-08-19 20:24:34 -0500 |
commit | 3a2ff17af66dfb135ead212de458e7f6860c8004 (patch) | |
tree | 58f3a8b8e5079737d1f8a7c0441f52485a615d9e | |
parent | 6f530de9443a4e2ab3d193624ff6ecd3c2b06de2 (diff) | |
download | rails-3a2ff17af66dfb135ead212de458e7f6860c8004.tar.gz rails-3a2ff17af66dfb135ead212de458e7f6860c8004.tar.bz2 rails-3a2ff17af66dfb135ead212de458e7f6860c8004.zip |
Don't shadow query string method
-rw-r--r-- | actionpack/lib/action_controller/rack_process.rb | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/rack_process.rb b/actionpack/lib/action_controller/rack_process.rb index 69bfc549c1..1ace16da07 100644 --- a/actionpack/lib/action_controller/rack_process.rb +++ b/actionpack/lib/action_controller/rack_process.rb @@ -25,7 +25,7 @@ module ActionController #:nodoc: end %w[ AUTH_TYPE GATEWAY_INTERFACE PATH_INFO - PATH_TRANSLATED QUERY_STRING REMOTE_HOST + PATH_TRANSLATED REMOTE_HOST REMOTE_IDENT REMOTE_USER SCRIPT_NAME SERVER_NAME SERVER_PROTOCOL @@ -37,6 +37,15 @@ module ActionController #:nodoc: end end + def query_string + qs = super + if !qs.blank? + qs + else + @env['QUERY_STRING'] + end + end + def body_stream #:nodoc: @env['rack.input'] end |