github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-04 03:00:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Undo condition change made in [2345] to prevent normal parameters arriving as StringIO.

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2379 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Nicholas Seckar
2005-09-27 23:39:56 +00:00
parent 0bd11857ef
commit 0b1abc3360
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/CHANGELOG
View File

@@ -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]

2
actionpack/lib/action_controller/cgi_ext/cgi_methods.rb
View File

@@ -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