mirror/whippy-edition
1
0
Fork 0
mirror of https://github.com/whippyshou/mastodon synced 2024-11-25 07:37:08 +09:00
Code

Fix remote convertible media attachments not being saved (#13032)

Browse Source 
Because the file name was set after loading the file, Paperclip
was flagging the differing file extension as content type spoofing

Fix #12938
This commit is contained in:
Eugen Rochko 2020-02-03 18:45:56 +01:00 committed by GitHub
parent c253f5c57e
commit ff07e80533
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/concerns/remotable.rb
View File

@ -36,8 +36,8 @@ module Remotable
basename = SecureRandom.hex(8) basename = SecureRandom.hex(8)
send("#{attachment_name}=", StringIO.new(response.body_with_limit(limit)))
send("#{attachment_name}_file_name=", basename + extname) send("#{attachment_name}_file_name=", basename + extname)
send("#{attachment_name}=", StringIO.new(response.body_with_limit(limit)))
self[attribute_name] = url if has_attribute?(attribute_name) self[attribute_name] = url if has_attribute?(attribute_name)
end end