diff options
| author | lambda <lain@soykaf.club> | 2019-04-08 09:18:01 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-04-08 09:18:01 +0000 |
| commit | b4da2bc1d009ecca0d7821abe3577d1a920c41c0 (patch) | |
| tree | c75ce1ec6e70724c29efe540a2439de635abc160 /lib/pleroma/web/metadata | |
| parent | cfa6e7289f5cfdb1fce17eb89bc0513ff624480d (diff) | |
| parent | b177e1e7f330ff1531be190949db7f75e378a449 (diff) | |
| download | pleroma-b4da2bc1d009ecca0d7821abe3577d1a920c41c0.tar.gz | |
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
# Conflicts:
# config/config.exs
# docs/config.md
Diffstat (limited to 'lib/pleroma/web/metadata')
| -rw-r--r-- | lib/pleroma/web/metadata/utils.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/metadata/utils.ex b/lib/pleroma/web/metadata/utils.ex index 23bbde1a6..58385a3d1 100644 --- a/lib/pleroma/web/metadata/utils.ex +++ b/lib/pleroma/web/metadata/utils.ex @@ -12,7 +12,7 @@ defmodule Pleroma.Web.Metadata.Utils do # html content comes from DB already encoded, decode first and scrub after |> HtmlEntities.decode() |> String.replace(~r/<br\s?\/?>/, " ") - |> HTML.get_cached_stripped_html_for_object(object, __MODULE__) + |> HTML.get_cached_stripped_html_for_activity(object, "metadata") |> Formatter.demojify() |> Formatter.truncate() end |