TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Normalize file parameters in same place as other parameters (ActionDispatch::Http::Parameters#normalize_encode_params)

Browse Source
This commit is contained in:
robertomiranda 2013-08-14 17:59:27 -05:00
parent a4d4af4083
commit 5e6a8b9119
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/lib/action_dispatch/http/parameters.rb
View File

@ -59,6 +59,8 @@ def reset_parameters #:nodoc:
def normalize_encode_params(params)
if params.is_a?(String)
return params.force_encoding(Encoding::UTF_8).encode!
elsif Hash === params && params.has_key?(:tempfile)
return UploadedFile.new(params)
elsif !params.is_a?(Hash)
return params
end

1
actionpack/lib/action_dispatch/http/request.rb
View File

@ -18,7 +18,6 @@ class Request < Rack::Request
include ActionDispatch::Http::MimeNegotiation
include ActionDispatch::Http::Parameters
include ActionDispatch::Http::FilterParameters
include ActionDispatch::Http::Upload
include ActionDispatch::Http::URL
autoload :Session, 'action_dispatch/request/session'

13
actionpack/lib/action_dispatch/http/upload.rb
View File

@ -73,18 +73,5 @@ def encode_filename(filename)
filename.force_encoding(Encoding::UTF_8).encode! if filename
end
end
module Upload # :nodoc:
# Replace file upload hash with UploadedFile objects
# when normalize and encode parameters.
def normalize_encode_params(value)
if Hash === value && value.has_key?(:tempfile)
UploadedFile.new(value)
else
super
end
end
private :normalize_encode_params
end
end
end