diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-03-23 19:32:01 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-03-23 19:32:01 +0000 |
| commit | fbf02a372254940c16908ef608e67fd28cfa4bf0 (patch) | |
| tree | b1273d143cf4cc4a5998fdb424880c1a89d7cb9e /lib | |
| parent | d931a59072de0861e889c6349eacc3d7f1f41fd9 (diff) | |
| parent | 15be6ba9c200b2a4ae153d26876be1b5cbb6357e (diff) | |
| download | pleroma-fbf02a372254940c16908ef608e67fd28cfa4bf0.tar.gz | |
Merge branch 'bugfix/profile-bio-newline' into 'develop'
AccountView: fix for other forms of <br> in bio
Closes #1643
See merge request pleroma/pleroma!2322
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/account_view.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex index 4ebce73b4..2bf711386 100644 --- a/lib/pleroma/web/mastodon_api/views/account_view.ex +++ b/lib/pleroma/web/mastodon_api/views/account_view.ex @@ -115,7 +115,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do fields: user.fields, bot: bot, source: %{ - note: Pleroma.HTML.strip_tags((user.bio || "") |> String.replace("<br>", "\n")), + note: (user.bio || "") |> String.replace(~r(<br */?>), "\n") |> Pleroma.HTML.strip_tags(), sensitive: false, fields: user.raw_fields, pleroma: %{ |