diff options
| author | tusooa <tusooa@kazv.moe> | 2023-04-26 15:39:20 +0000 |
|---|---|---|
| committer | tusooa <tusooa@kazv.moe> | 2023-04-26 15:39:20 +0000 |
| commit | ddf57596be8f67abd8ac81fa9a9a1ca84321e7ad (patch) | |
| tree | 47df23fb8b49850df45eb77d5cf91bc2b513753c /lib | |
| parent | 286b9bb66c3845ed9cf56efd05cacd3e13345671 (diff) | |
| parent | 2148ef5e2fcced6a52f0cfda38abcf697698dd1a (diff) | |
| download | pleroma-ddf57596be8f67abd8ac81fa9a9a1ca84321e7ad.tar.gz pleroma-ddf57596be8f67abd8ac81fa9a9a1ca84321e7ad.zip | |
Merge branch 'bugfix/content-disposition' into 'develop'
UploadedMedia: Add missing disposition_type to Content-Disposition
Closes #3114
See merge request pleroma/pleroma!3873
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/plugs/uploaded_media.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/plugs/uploaded_media.ex b/lib/pleroma/web/plugs/uploaded_media.ex index ad8143234..8b3bc9acb 100644 --- a/lib/pleroma/web/plugs/uploaded_media.ex +++ b/lib/pleroma/web/plugs/uploaded_media.ex @@ -35,9 +35,9 @@ defmodule Pleroma.Web.Plugs.UploadedMedia do conn = case fetch_query_params(conn) do %{query_params: %{"name" => name}} = conn -> - name = String.replace(name, "\"", "\\\"") + name = String.replace(name, ~s["], ~s[\\"]) - put_resp_header(conn, "content-disposition", "filename=\"#{name}\"") + put_resp_header(conn, "content-disposition", ~s[inline; filename="#{name}"]) conn -> conn |