mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
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
This commit is contained in:
parent
0bd11857ef
commit
0b1abc3360
2 changed files with 3 additions and 1 deletions
|
@ -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]
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue