diff options
| author | Roger Braun <roger@rogerbraun.net> | 2018-02-11 09:50:55 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2018-02-11 09:50:55 +0100 |
| commit | 52200998c997576c9008cbe50b0a7b9f0e6134cc (patch) | |
| tree | c0d68f476442b8dd86fca1e182d5c09553800810 /lib/pleroma/upload.ex | |
| parent | 4a13b8488787773d09f67d1a436d5906e2f5b171 (diff) | |
| parent | 0e2ca77eec511857508208d3faeb9217c4496f8a (diff) | |
| download | pleroma-52200998c997576c9008cbe50b0a7b9f0e6134cc.tar.gz | |
Merge branch 'develop' into feature/activitypub
Diffstat (limited to 'lib/pleroma/upload.ex')
| -rw-r--r-- | lib/pleroma/upload.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex index 3567c6c88..c41617c68 100644 --- a/lib/pleroma/upload.ex +++ b/lib/pleroma/upload.ex @@ -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 |