diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-07-14 00:39:06 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-07-14 00:39:06 +0300 |
| commit | 418ae6638d64c915ce4dae742dd493f43c8025d8 (patch) | |
| tree | 88dab25ac8f569c2a7c12300be79f6cbd8357afe /lib/pleroma/web/media_proxy/controller.ex | |
| parent | a9459ff98f0af590931ef279c2bc7efb0cceac5a (diff) | |
| parent | 592411e4fe8a1cf39064e3dd5f9312ed5cdcd22e (diff) | |
| download | pleroma-418ae6638d64c915ce4dae742dd493f43c8025d8.tar.gz | |
Merge branch 'develop' into feature/admin-api-user-statuses
Diffstat (limited to 'lib/pleroma/web/media_proxy/controller.ex')
| -rw-r--r-- | lib/pleroma/web/media_proxy/controller.ex | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/pleroma/web/media_proxy/controller.ex b/lib/pleroma/web/media_proxy/controller.ex index c0552d89f..ea33d7685 100644 --- a/lib/pleroma/web/media_proxy/controller.ex +++ b/lib/pleroma/web/media_proxy/controller.ex @@ -28,12 +28,7 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do end def filename_matches(has_filename, path, url) do - filename = - url - |> MediaProxy.filename() - |> URI.decode() - - path = URI.decode(path) + filename = url |> MediaProxy.filename() if has_filename && filename && Path.basename(path) != filename do {:wrong_filename, filename} |