logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: ad180ad6dde1d095a8b337720d6b19f0f493089d
parent: 35ac549a99f325d2e73c03d7c2951f3d6570b7b4
Author: lambda <pleromagit@rogerbraun.net>
Date:   Fri, 22 Dec 2017 12:07:10 +0000

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

Remove a useless URI.encode call in MediaProxy

See merge request pleroma/pleroma!42

Diffstat:

Mlib/pleroma/web/media_proxy/controller.ex1-
1 file changed, 0 insertions(+), 1 deletion(-)

diff --git a/lib/pleroma/web/media_proxy/controller.ex b/lib/pleroma/web/media_proxy/controller.ex @@ -14,7 +14,6 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController 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