From 979c22444d832e51b29c0404e3b990cab00606e9 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 12 Jun 2007 07:44:23 +0000 Subject: Tolerate missing content type on multipart file uploads. Fix for Safari 3. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7005 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/request.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'actionpack/lib/action_controller') diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb index 2f0e86d2a2..5dbd4db9f5 100755 --- a/actionpack/lib/action_controller/request.rb +++ b/actionpack/lib/action_controller/request.rb @@ -423,10 +423,8 @@ module ActionController when Array value.map { |v| get_typed_value(v) } else - # Uploaded file provides content type and filename. - if value.respond_to?(:content_type) && - !value.content_type.blank? && - !value.original_filename.blank? + # This is an uploaded file. + if value.respond_to?(:original_filename) && !value.original_filename.blank? unless value.respond_to?(:full_original_filename) class << value alias_method :full_original_filename, :original_filename -- cgit v1.2.3