From 0b1abc3360706268618dabcb1868fb0406d997aa Mon Sep 17 00:00:00 2001 From: Nicholas Seckar Date: Tue, 27 Sep 2005 23:39:56 +0000 Subject: Undo condition change made in [2345] to prevent normal parameters arriving as StringIO. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2379 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/CHANGELOG | 2 ++ actionpack/lib/action_controller/cgi_ext/cgi_methods.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'actionpack') diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 78d73852bb..a6c2dce569 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Undo condition change made in [2345] to prevent normal parameters arriving as StringIO. + * Tolerate consecutive delimiters in query parameters. #2295 [darashi@gmail.com] * Streamline render process, code cleaning. Closes #2294. [skae] diff --git a/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb b/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb index 817d9d0d0d..a2ba601662 100755 --- a/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb +++ b/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb @@ -91,7 +91,7 @@ class CGIMethods #:nodoc: # test most frequent case first if value.is_a?(String) value - elsif value.respond_to?(:content_type) + elsif value.respond_to?(:content_type) && ! value.content_type.blank? # Uploaded file unless value.respond_to?(:full_original_filename) class << value -- cgit v1.2.3