aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2019-01-15 07:40:00 +0100
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2019-01-15 07:40:39 +0100
commite3eb75bd234c8e21ff937d4f9b2a4a1328007e32 (patch)
treec25bc0ee513145526c8dafead36b293cd9cdfacc /lib
parentf20bfc9ea5059735c02f8a7260733bc7efbc90bd (diff)
downloadpleroma-e3eb75bd234c8e21ff937d4f9b2a4a1328007e32.tar.gz
Upload: Fix uploading with a ? in the filename
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/upload.ex7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index 185ba25fa..1d8b073af 100644
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -215,7 +215,12 @@ defmodule Pleroma.Upload do
end
defp url_from_spec(base_url, {:file, path}) do
- [base_url, "media", URI.encode(path)]
+ path =
+ path
+ |> URI.encode()
+ |> String.replace("?", "%3F")
+
+ [base_url, "media", path]
|> Path.join()
end