diff options
author | Alex Gleason <alex@alexgleason.me> | 2022-01-25 17:43:39 +0000 |
---|---|---|
committer | Alex Gleason <alex@alexgleason.me> | 2022-01-25 17:43:39 +0000 |
commit | 0f4e0e667e870e38cf53d30d3ac3e3571aca4212 (patch) | |
tree | 3960d39f8976422db0415466c95456ab4db71a20 /priv | |
parent | 99e9c2c668228e7f373a7ced23e4c5701a86f11b (diff) | |
parent | 65b4d2ce8450098ee2eaa2057968a4f47aa536c1 (diff) | |
download | pleroma-0f4e0e667e870e38cf53d30d3ac3e3571aca4212.tar.gz pleroma-0f4e0e667e870e38cf53d30d3ac3e3571aca4212.zip |
Merge branch 'recipients-inline' into 'develop'
ForceMentionsInContent: wrap mentions in a span, fix the formatting
See merge request pleroma/pleroma!3620
Diffstat (limited to 'priv')
-rw-r--r-- | priv/scrubbers/default.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/priv/scrubbers/default.ex b/priv/scrubbers/default.ex index 4694a92a5..f33a721a8 100644 --- a/priv/scrubbers/default.ex +++ b/priv/scrubbers/default.ex @@ -56,7 +56,7 @@ defmodule Pleroma.HTML.Scrubber.Default do Meta.allow_tag_with_these_attributes(:u, []) Meta.allow_tag_with_these_attributes(:ul, []) - Meta.allow_tag_with_this_attribute_values(:span, "class", ["h-card"]) + Meta.allow_tag_with_this_attribute_values(:span, "class", ["h-card", "recipients-inline"]) Meta.allow_tag_with_these_attributes(:span, []) Meta.allow_tag_with_this_attribute_values(:code, "class", ["inline"]) |