diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-03-23 19:32:01 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-03-31 13:42:02 +0300 |
| commit | e99e2a86afd50c8a7d0f243e1e4017f06ec75441 (patch) | |
| tree | e09cc22ff47d7aee9dd91a26d4c3d5aaeafe8535 /lib | |
| parent | c4d3ccc7b952445069ed3fc8586da14af6db937d (diff) | |
| download | pleroma-e99e2a86afd50c8a7d0f243e1e4017f06ec75441.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 341dc2c91..a234e7028 100644 --- a/lib/pleroma/web/mastodon_api/views/account_view.ex +++ b/lib/pleroma/web/mastodon_api/views/account_view.ex @@ -122,7 +122,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: %{ |