diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-07-02 16:36:54 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-07-02 16:36:54 +0300 |
| commit | 61180ab6f4b85ab78de2eaf1bc1b974c9e7908af (patch) | |
| tree | 0970691b2060e06b6feaf4e645021298a7efda0d /lib/pleroma/helpers | |
| parent | 0e23138b50f1fdd9ea78df31eec1b3caac905e2c (diff) | |
| parent | 4c044f62258b33a95b8281e1eb42a5e0ce47d42d (diff) | |
| download | pleroma-61180ab6f4b85ab78de2eaf1bc1b974c9e7908af.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# lib/pleroma/web/media_proxy/media_proxy_controller.ex
Diffstat (limited to 'lib/pleroma/helpers')
| -rw-r--r-- | lib/pleroma/helpers/uri_helper.ex | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/pleroma/helpers/uri_helper.ex b/lib/pleroma/helpers/uri_helper.ex index 256252ddb..6d205a636 100644 --- a/lib/pleroma/helpers/uri_helper.ex +++ b/lib/pleroma/helpers/uri_helper.ex @@ -17,11 +17,6 @@ defmodule Pleroma.Helpers.UriHelper do |> URI.to_string() end - def append_param_if_present(%{} = params, param_name, param_value) do - if param_value do - Map.put(params, param_name, param_value) - else - params - end - end + def maybe_add_base("/" <> uri, base), do: Path.join([base, uri]) + def maybe_add_base(uri, _base), do: uri end |