sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Remove a useless URI.encode call in MediaProxy

See merge request pleroma/pleroma!42
This commit is contained in:
lambda 2017-12-22 12:07:10 +00:00
commit ad180ad6dd
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/pleroma/web/media_proxy/controller.ex
View File

@ -14,7 +14,6 @@ def remote(conn, %{"sig" => sig, "url" => url}) do
with \ with \
true <- Keyword.get(config, :enabled, false), true <- Keyword.get(config, :enabled, false),
{:ok, url} <- Pleroma.Web.MediaProxy.decode_url(sig, url), {:ok, url} <- Pleroma.Web.MediaProxy.decode_url(sig, url),
url = URI.encode(url),
{:ok, content_type, body} <- proxy_request(url) {:ok, content_type, body} <- proxy_request(url)
do do
conn conn