diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-07-13 22:47:47 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-07-13 22:47:47 -0500 |
| commit | deb3f911366925bcc342a4a0deb44a2e7da7f1ba (patch) | |
| tree | c8e587198f64c4c5f991a05561943c6bd0af465b /priv/scrubbers | |
| parent | 5e88796784e0ac2dbf57d9cf954fdc8ae8aeae43 (diff) | |
| parent | 173e977e283789a814278c63bc81f40a13942e21 (diff) | |
| download | pleroma-deb3f911366925bcc342a4a0deb44a2e7da7f1ba.tar.gz pleroma-deb3f911366925bcc342a4a0deb44a2e7da7f1ba.zip | |
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sort
Diffstat (limited to 'priv/scrubbers')
| -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 |