sjw/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-29 03:05:19 +01:00
Code Issues Releases Wiki Activity

Merge branch 'fix/no-image-upload-filetype' into 'develop'

Browse Source 
Detect file type if none given.

See merge request pleroma/pleroma!62
This commit is contained in:
eal 2018-02-05 21:57:17 +00:00
commit 8df0aee889
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/upload.ex
View File

@ -9,7 +9,7 @@ defmodule Pleroma.Upload do
File.cp!(file.path, result_file)
# fix content type on some image uploads
content_type = if file.content_type == "application/octet-stream" do
content_type = if file.content_type in [nil, "application/octet-stream"] do
get_content_type(file.path)
else
file.content_type