aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller')
-rwxr-xr-xactionpack/lib/action_controller/request.rb4
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=""