diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-12-27 11:17:53 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-12-27 11:17:53 +0000 |
| commit | 41c82e66c1abb2abbf5081c1e18b6070a6bbbd01 (patch) | |
| tree | 2040ea543636046ed55d3e0769b6d02f086b0810 /actionpack/lib/action_controller | |
| parent | 699cc15116ab88c9ae6bea0e5d0020b8cf16680e (diff) | |
| download | rails-41c82e66c1abb2abbf5081c1e18b6070a6bbbd01.tar.gz rails-41c82e66c1abb2abbf5081c1e18b6070a6bbbd01.tar.bz2 rails-41c82e66c1abb2abbf5081c1e18b6070a6bbbd01.zip | |
Ruby 1.9 compat: file uploads. References #1689 [Frederick Cheung]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8492 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
| -rwxr-xr-x | actionpack/lib/action_controller/request.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb index 19948da9c2..c48426d377 100755 --- a/actionpack/lib/action_controller/request.rb +++ b/actionpack/lib/action_controller/request.rb @@ -473,7 +473,7 @@ module ActionController when Array value.map { |v| get_typed_value(v) } else - if value.is_a?(UploadedFile) + if value.respond_to? :original_filename # Uploaded file if value.original_filename value @@ -498,7 +498,7 @@ module ActionController def read_multipart(body, boundary, content_length, env) params = Hash.new([]) boundary = "--" + boundary - quoted_boundary = Regexp.quote(boundary, "n") + quoted_boundary = Regexp.quote(boundary) buf = "" bufsize = 10 * 1024 boundary_end="" |