aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorNicholas Seckar <nseckar@gmail.com>2005-09-27 23:39:56 +0000
committerNicholas Seckar <nseckar@gmail.com>2005-09-27 23:39:56 +0000
commit0b1abc3360706268618dabcb1868fb0406d997aa (patch)
treeb57eb8700e1aad76af641753fe698e709e6756d4 /actionpack/lib
parent0bd11857ef47d9c8228d9c1d8268a7a35768966b (diff)
downloadrails-0b1abc3360706268618dabcb1868fb0406d997aa.tar.gz
rails-0b1abc3360706268618dabcb1868fb0406d997aa.tar.bz2
rails-0b1abc3360706268618dabcb1868fb0406d997aa.zip
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
Diffstat (limited to 'actionpack/lib')
-rwxr-xr-xactionpack/lib/action_controller/cgi_ext/cgi_methods.rb2
1 files changed, 1 insertions, 1 deletions
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