X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fupload.ex;h=c41617c68e80fe4130f5d24a2990e7c93f216622;hb=82e34cae95a204475f4419758c980ddd922be095;hp=3567c6c8893388c76e8a90d4c3a2136375ac6785;hpb=08bc31674218cd7ce634b008b7766b48e49c52e3;p=akkoma 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