github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-04 03:23:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2772 from mkayman/s3_store_content_disposition

Browse Source 
Don't set content-disposition header for images
This commit is contained in:
Régis Hanol 2014-09-09 19:12:09 +02:00
commit d4d6ff8e45
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/file_store/s3_store.rb
View File

@ -139,7 +139,11 @@ module FileStore
public: true,
body: file
}
args[:content_disposition] = "attachment; filename=\"#{filename}\"" if filename
if filename && !FileHelper.is_image?(filename)
args[:content_disposition] = "attachment; filename=\"#{filename}\""
end
args[:content_type] = content_type if content_type
get_or_create_directory(s3_bucket).files.create(args)