diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-07-24 15:35:25 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-07-24 15:35:25 +0000 |
| commit | acd20914ec5a2cedfcd6a7405a22b6453d951164 (patch) | |
| tree | b0a7fa03d0522e7b6ae243bb62b750fcb653fb6b /lib | |
| parent | 7286cdff7a1487e79ee48b572fe6888542b1dfbd (diff) | |
| parent | 84fca14c3c6b3a5a6f3b0894903867dfa50a78bb (diff) | |
| download | pleroma-acd20914ec5a2cedfcd6a7405a22b6453d951164.tar.gz | |
Merge branch 'fix/Upload_base_url' into 'develop'
Fix/upload base url
See merge request pleroma/pleroma!1484
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/upload.ex | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex index c47d65241..9f0adde5b 100644 --- a/lib/pleroma/upload.ex +++ b/lib/pleroma/upload.ex @@ -228,7 +228,14 @@ defmodule Pleroma.Upload do "" end - [base_url, "media", path] + prefix = + if is_nil(Pleroma.Config.get([__MODULE__, :base_url])) do + "media" + else + "" + end + + [base_url, prefix, path] |> Path.join() end |