diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-05-11 22:30:36 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-05-11 22:30:36 +0000 |
| commit | f8190aea5e68a6e17ccc88b13486bd69c3b08450 (patch) | |
| tree | f85b4b544140ed1fa011bec335bab41a69f0db61 /lib | |
| parent | 2ead4e108a802e73aea34e506a4f9f50eb0b3993 (diff) | |
| parent | 4d71c4b8051d5cf54f37903091aed7f4d5c1ddd9 (diff) | |
| download | pleroma-f8190aea5e68a6e17ccc88b13486bd69c3b08450.tar.gz pleroma-f8190aea5e68a6e17ccc88b13486bd69c3b08450.zip | |
Merge branch 'fix/issue-1676' into 'develop'
[#1676] fixed 'source' object in verify_credentials
See merge request pleroma/pleroma!2492
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/account_view.ex | 5 |
1 files changed, 4 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 420bd586f..b7cdb52b1 100644 --- a/lib/pleroma/web/mastodon_api/views/account_view.ex +++ b/lib/pleroma/web/mastodon_api/views/account_view.ex @@ -261,7 +261,10 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do defp prepare_user_bio(%User{bio: ""}), do: "" defp prepare_user_bio(%User{bio: bio}) when is_binary(bio) do - bio |> String.replace(~r(<br */?>), "\n") |> Pleroma.HTML.strip_tags() + bio + |> String.replace(~r(<br */?>), "\n") + |> Pleroma.HTML.strip_tags() + |> HtmlEntities.decode() end defp prepare_user_bio(_), do: "" |