diff options
| author | lain <lain@soykaf.club> | 2020-05-25 13:57:27 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-25 13:57:27 +0200 |
| commit | ee35bb5ac287e0ff913685256a826e759add3fb9 (patch) | |
| tree | 971031903f987e4b70768ac1f91666fdfe6a10b4 /lib/pleroma/helpers/uri_helper.ex | |
| parent | 578ed3a37f28ecbd9fd976c54ee53e8ed2a6adff (diff) | |
| parent | ec470c4c7717dc9479df9e7b70f9805dcf2f5e08 (diff) | |
| download | pleroma-ee35bb5ac287e0ff913685256a826e759add3fb9.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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 |