Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 7005

Show
Ignore:
Timestamp:
06/12/07 07:44:23 (3 years ago)
Author:
bitsweat
Message:

Tolerate missing content type on multipart file uploads. Fix for Safari 3.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionpack/CHANGELOG

    r6992 r7005  
    11*SVN* 
     2 
     3* Tolerate missing content type on multipart file uploads. Fix for Safari 3.  [Jeremy Kemper] 
    24 
    35* Deprecation: remove pagination. Install the classic_pagination plugin for forward compatibility, or move to the superior will_paginate plugin.  #8157 [Josh Peek] 

  • trunk/actionpack/lib/action_controller/request.rb

    r6877 r7005  
    424424              value.map { |v| get_typed_value(v) } 
    425425            else 
    426               # Uploaded file provides content type and filename. 
    427               if value.respond_to?(:content_type) && 
    428                     !value.content_type.blank? && 
    429                     !value.original_filename.blank? 
     426              # This is an uploaded file. 
     427              if value.respond_to?(:original_filename) && !value.original_filename.blank? 
    430428                unless value.respond_to?(:full_original_filename) 
    431429                  class << value 

  • trunk/actionpack/test/controller/request_test.rb

    r6877 r7005  
    691691    file = params['file'] 
    692692    assert_kind_of StringIO, file 
    693     assert_equal 'file.txt', file.original_filename 
    694     assert_equal "text/plain\r", file.content_type 
     693    assert_equal 'file.csv', file.original_filename 
     694    assert_equal '', file.content_type 
    695695    assert_equal 'contents', file.read 
    696696