diff options
| author | feld <feld@feld.me> | 2021-05-04 13:29:14 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-05-04 13:29:14 +0000 |
| commit | d5263bfcf37cb1f6190d0848c6b417d33d8fb979 (patch) | |
| tree | d6884f389f87a483efbbaf571da97260eebd0337 /priv | |
| parent | 377f84f3678f9c2541fbd4a200cd93c5ab0dea24 (diff) | |
| parent | dca87c5e7b4b12918cf59a83a77be389a7e0df01 (diff) | |
| download | pleroma-d5263bfcf37cb1f6190d0848c6b417d33d8fb979.tar.gz pleroma-d5263bfcf37cb1f6190d0848c6b417d33d8fb979.zip | |
Merge branch 'earmark' into 'develop'
Upgrade Earmark to v1.4.15
Closes #1942 and #2026
See merge request pleroma/pleroma!3076
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 |