diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-05-07 12:40:45 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-05-07 12:40:45 -0500 |
| commit | cea44b6b3ebac3976699d2460ae53d8506b86445 (patch) | |
| tree | 66ac637884dcc1c80b9632c40d90d273815a2d53 /priv | |
| parent | 20878c7f9913e1501821356f24e97c2c42b00a41 (diff) | |
| parent | 745375bdcf2679ff803dd4ebc4a8313a7b5fb157 (diff) | |
| download | pleroma-cea44b6b3ebac3976699d2460ae53d8506b86445.tar.gz pleroma-cea44b6b3ebac3976699d2460ae53d8506b86445.zip | |
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
Diffstat (limited to 'priv')
| -rw-r--r-- | priv/scrubbers/default.ex | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/priv/scrubbers/default.ex b/priv/scrubbers/default.ex index 7b06994de..4694a92a5 100644 --- a/priv/scrubbers/default.ex +++ b/priv/scrubbers/default.ex @@ -39,6 +39,7 @@ defmodule Pleroma.HTML.Scrubber.Default do Meta.allow_tag_with_these_attributes(:code, []) Meta.allow_tag_with_these_attributes(:del, []) Meta.allow_tag_with_these_attributes(:em, []) + Meta.allow_tag_with_these_attributes(:hr, []) Meta.allow_tag_with_these_attributes(:i, []) Meta.allow_tag_with_these_attributes(:li, []) Meta.allow_tag_with_these_attributes(:ol, []) @@ -58,6 +59,8 @@ defmodule Pleroma.HTML.Scrubber.Default do Meta.allow_tag_with_this_attribute_values(:span, "class", ["h-card"]) Meta.allow_tag_with_these_attributes(:span, []) + Meta.allow_tag_with_this_attribute_values(:code, "class", ["inline"]) + @allow_inline_images Pleroma.Config.get([:markup, :allow_inline_images]) if @allow_inline_images do |