Commit ad180ad6 authored by lain's avatar lain
Browse files

Merge branch 'media-proxy-fix-encoding' into 'develop'

Remove a useless URI.encode call in MediaProxy

See merge request pleroma/pleroma!42
parents 35ac549a 0ccd0e5c
Pipeline #453 passed with stage
in 3 minutes
......@@ -14,7 +14,6 @@ def remote(conn, %{"sig" => sig, "url" => url}) do
with \
true <- Keyword.get(config, :enabled, false),
{:ok, url} <- Pleroma.Web.MediaProxy.decode_url(sig, url),
url = URI.encode(url),
{:ok, content_type, body} <- proxy_request(url)
do
conn
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment