diff options
author | Rin Toshaka <rinpatch@sdf.org> | 2018-12-06 18:11:22 +0100 |
---|---|---|
committer | Rin Toshaka <rinpatch@sdf.org> | 2018-12-06 18:11:22 +0100 |
commit | 88f92693f25c34f8ab82d4ed809b266bf5fb9ff8 (patch) | |
tree | d6115e451d0cd98672669c6ba93921f75f21e16a /lib/pleroma/html.ex | |
parent | ca7b46fb3ba576fb7e67eba02654e6df9299392a (diff) | |
parent | 1d531fd2f32a7f8fff562a3122b30b8ccdccead0 (diff) | |
download | pleroma-88f92693f25c34f8ab82d4ed809b266bf5fb9ff8.tar.gz |
Merge develop
Diffstat (limited to 'lib/pleroma/html.ex')
-rw-r--r-- | lib/pleroma/html.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/html.ex b/lib/pleroma/html.ex index 1b920d7fd..5daaa5e69 100644 --- a/lib/pleroma/html.ex +++ b/lib/pleroma/html.ex @@ -45,7 +45,7 @@ defmodule Pleroma.HTML.Scrubber.TwitterText do Meta.strip_comments() # links - Meta.allow_tag_with_uri_attributes("a", ["href"], @valid_schemes) + Meta.allow_tag_with_uri_attributes("a", ["href", "data-user", "data-tag"], @valid_schemes) Meta.allow_tag_with_these_attributes("a", ["name", "title"]) # paragraphs and linebreaks @@ -86,7 +86,7 @@ defmodule Pleroma.HTML.Scrubber.Default do Meta.remove_cdata_sections_before_scrub() Meta.strip_comments() - Meta.allow_tag_with_uri_attributes("a", ["href"], @valid_schemes) + Meta.allow_tag_with_uri_attributes("a", ["href", "data-user", "data-tag"], @valid_schemes) Meta.allow_tag_with_these_attributes("a", ["name", "title"]) Meta.allow_tag_with_these_attributes("abbr", ["title"]) |