diff options
| author | Mark Felder <feld@feld.me> | 2021-01-12 16:34:24 -0600 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2021-01-12 16:34:24 -0600 |
| commit | c35e6fb51615fa3d22cfedeac2158ee62ea9b663 (patch) | |
| tree | 5a1126a33556503e04b8e973851b1f069241bcb1 | |
| parent | 12528edc349a6ec10b1a1d9a7daf461823fdf928 (diff) | |
| download | pleroma-c35e6fb51615fa3d22cfedeac2158ee62ea9b663.tar.gz | |
Provide a non-nil fallback for Upload.base_url/0 for tests using TestUploaderSuccess as the uploader
| -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 619a85e93..e714dc57b 100644 --- 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 |