aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/helpers
diff options
context:
space:
mode:
authoreugenijm <eugenijm@protonmail.com>2020-04-12 22:54:43 +0300
committereugenijm <eugenijm@protonmail.com>2020-05-21 04:41:42 +0300
commitb7fc61e17b995e3aa4e52f85b91d320a1cd1e106 (patch)
tree2b361619e710819c511b986804e6e92ac8664c15 /lib/pleroma/helpers
parent42b06d78dfc9cec2a31bcb4676cc0135863ca97d (diff)
downloadpleroma-b7fc61e17b995e3aa4e52f85b91d320a1cd1e106.tar.gz
Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE
Diffstat (limited to 'lib/pleroma/helpers')
-rw-r--r--lib/pleroma/helpers/uri_helper.ex3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/pleroma/helpers/uri_helper.ex b/lib/pleroma/helpers/uri_helper.ex
index 256252ddb..69d8c8fe0 100644
--- a/lib/pleroma/helpers/uri_helper.ex
+++ b/lib/pleroma/helpers/uri_helper.ex
@@ -24,4 +24,7 @@ defmodule Pleroma.Helpers.UriHelper do
params
end
end
+
+ def maybe_add_base("/" <> uri, base), do: Path.join([base, uri])
+ def maybe_add_base(uri, _base), do: uri
end