logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 8b18955a5989b1c1855c06d897f572fcf4938760
parent fee360e581d9aced145d21429eba5a63b3f682d1
Author: rinpatch <rinpatch@sdf.org>
Date:   Fri, 22 Mar 2019 21:17:00 +0000

Merge branch 'hotfix/null-content' into 'develop'

Fix text being nullable in TwitterAPI

See merge request pleroma/pleroma!966

Diffstat:

Mlib/pleroma/web/twitter_api/views/activity_view.ex2++
1 file changed, 2 insertions(+), 0 deletions(-)

diff --git a/lib/pleroma/web/twitter_api/views/activity_view.ex b/lib/pleroma/web/twitter_api/views/activity_view.ex @@ -266,6 +266,8 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do content |> String.replace(~r/<br\s?\/?>/, "\n") |> HTML.get_cached_stripped_html_for_object(activity, __MODULE__) + else + "" end reply_parent = Activity.get_in_reply_to_activity(activity)