diff options
| author | lain <lain@soykaf.club> | 2019-08-24 15:48:33 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-08-24 15:48:33 +0200 |
| commit | cc6c0b4ba6762e6a9b0a90c3dcda3f95283eb22a (patch) | |
| tree | e80078875de15734e045f39e0bd9f82310961201 /lib/pleroma/upload.ex | |
| parent | 0e2b5a3e6aed7947909c2a1ff1618403546f1572 (diff) | |
| parent | bc78a875c86db42d67122cfb767f239a55dacbea (diff) | |
| download | pleroma-cc6c0b4ba6762e6a9b0a90c3dcda3f95283eb22a.tar.gz | |
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
Diffstat (limited to 'lib/pleroma/upload.ex')
| -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 |