diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-06-17 15:38:10 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-06-17 15:38:10 -0500 |
| commit | 3a03d9b65f96099e7c7a831469532c2cec7294c6 (patch) | |
| tree | 46d84731c3a53157117fc4c8141fdf6b3d7b8b25 /priv/scrubbers/default.ex | |
| parent | a704d5499c03cb5609ea38a5f2ef06095ced3ef3 (diff) | |
| parent | a8adc300d4cfc88ef19f1977e32068437ed4ad00 (diff) | |
| download | pleroma-nsfw-api-mrf.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into nsfw-api-mrfnsfw-api-mrf
Diffstat (limited to 'priv/scrubbers/default.ex')
| -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 |