diff options
| author | feld <feld@feld.me> | 2020-01-12 17:25:25 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-01-12 17:25:25 +0000 |
| commit | ea4a462858c16d66228ab07db6c17e3cbd9114d1 (patch) | |
| tree | d7d328211ee7c3d69814f9acdf78e132abccb3c8 /lib | |
| parent | ecb8fe183c5a007e80d7b2b1bfc9ead89dc27cc2 (diff) | |
| parent | fa7d8e77e64abbbd488152d8063fe9d012c8ac06 (diff) | |
| download | pleroma-ea4a462858c16d66228ab07db6c17e3cbd9114d1.tar.gz | |
Merge branch 'issue/1487' into 'develop'
[#1487] fixed clear HTML entities after scrub html and truncate
See merge request pleroma/pleroma!2090
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/metadata/utils.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/metadata/utils.ex b/lib/pleroma/web/metadata/utils.ex index 382ecf426..589d11901 100644 --- a/lib/pleroma/web/metadata/utils.ex +++ b/lib/pleroma/web/metadata/utils.ex @@ -15,6 +15,7 @@ defmodule Pleroma.Web.Metadata.Utils do |> String.replace(~r/<br\s?\/?>/, " ") |> HTML.get_cached_stripped_html_for_activity(object, "metadata") |> Emoji.Formatter.demojify() + |> HtmlEntities.decode() |> Formatter.truncate() end @@ -25,6 +26,7 @@ defmodule Pleroma.Web.Metadata.Utils do |> String.replace(~r/<br\s?\/?>/, " ") |> HTML.strip_tags() |> Emoji.Formatter.demojify() + |> HtmlEntities.decode() |> Formatter.truncate(max_length) end |