diff options
| author | lain <lain@soykaf.club> | 2020-05-21 14:30:34 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-21 14:30:34 +0000 |
| commit | ab1154e13fece4ca552deaf5c62030c826c09760 (patch) | |
| tree | 88c27719adecc959d7741b44fe06117c456e1abb /lib/pleroma/helpers | |
| parent | a42a0716ec769dfbd97505b6c872c5ea1a8f800a (diff) | |
| parent | b7fc61e17b995e3aa4e52f85b91d320a1cd1e106 (diff) | |
| download | pleroma-ab1154e13fece4ca552deaf5c62030c826c09760.tar.gz | |
Merge branch 'admin-logo-upload' into 'develop'
Ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image
See merge request pleroma/pleroma!2388
Diffstat (limited to 'lib/pleroma/helpers')
| -rw-r--r-- | lib/pleroma/helpers/uri_helper.ex | 3 |
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 |