commit: c35e6fb51615fa3d22cfedeac2158ee62ea9b663
parent 12528edc349a6ec10b1a1d9a7daf461823fdf928
Author: Mark Felder <feld@feld.me>
Date: Tue, 12 Jan 2021 16:34:24 -0600
Provide a non-nil fallback for Upload.base_url/0 for tests using TestUploaderSuccess as the uploader
Diffstat:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
@@ -249,7 +249,7 @@ defmodule Pleroma.Upload do
end
_ ->
- public_endpoint || upload_base_url
+ public_endpoint || upload_base_url || Pleroma.Web.base_url() <> "/media/"
end
end
end