Merge branch 'hotfix/activity-without-content' into 'develop'
Twitter ActivityView: fix crash with activity without content See merge request pleroma/pleroma!572
This commit is contained in:
commit
a3e33fa177
|
@ -245,9 +245,11 @@ def render(
|
|||
|> Formatter.emojify(object["emoji"])
|
||||
|
||||
text =
|
||||
content
|
||||
|> String.replace(~r/<br\s?\/?>/, "\n")
|
||||
|> HTML.strip_tags()
|
||||
if content do
|
||||
content
|
||||
|> String.replace(~r/<br\s?\/?>/, "\n")
|
||||
|> HTML.strip_tags()
|
||||
end
|
||||
|
||||
reply_parent = Activity.get_in_reply_to_activity(activity)
|
||||
|
||||
|
|
Loading…
Reference in New Issue