diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-01-14 18:52:23 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-01-14 18:52:23 +0000 |
| commit | f20bfc9ea5059735c02f8a7260733bc7efbc90bd (patch) | |
| tree | d48b768640e5d49dca1328a7adc57bcf223f06e1 /lib | |
| parent | fd2f1258fb0249694d1ed7f5ba5a2f4baa858f20 (diff) | |
| parent | dcbe5bd58ccb1068d17ba15703169593d4bbb393 (diff) | |
| download | pleroma-f20bfc9ea5059735c02f8a7260733bc7efbc90bd.tar.gz | |
Merge branch 'media-url-escape' into 'develop'
URI escape file upload URLs
See merge request pleroma/pleroma!665
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/upload.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex index 0b1bdeec4..185ba25fa 100644 --- a/lib/pleroma/upload.ex +++ b/lib/pleroma/upload.ex @@ -215,7 +215,7 @@ defmodule Pleroma.Upload do end defp url_from_spec(base_url, {:file, path}) do - [base_url, "media", path] + [base_url, "media", URI.encode(path)] |> Path.join() end |