diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-01 17:38:57 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-01 17:38:57 +0400 |
| commit | 6b84c62d4a51cb17192945d1b67999b2c56a23d2 (patch) | |
| tree | 53744600bd910bb0a62be6ab5884c6972da2ffce /lib/pleroma/helpers/uri_helper.ex | |
| parent | cb8236cda62cddb72f4320af6347defae44b81ca (diff) | |
| parent | e96765df6b04fe5e9766271a9c62e559392758b2 (diff) | |
| download | pleroma-6b84c62d4a51cb17192945d1b67999b2c56a23d2.tar.gz | |
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
Diffstat (limited to 'lib/pleroma/helpers/uri_helper.ex')
| -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 |