Commit a3e33fa1 authored by lain's avatar lain
Browse files

Merge branch 'hotfix/activity-without-content' into 'develop'

Twitter ActivityView: fix crash with activity without content

See merge request !572
parents 093d39b6 f58f20ab
Pipeline #5646 passed with stages
in 3 minutes and 17 seconds
...@@ -245,9 +245,11 @@ def render( ...@@ -245,9 +245,11 @@ def render(
|> Formatter.emojify(object["emoji"]) |> Formatter.emojify(object["emoji"])
text = text =
if content do
content content
|> String.replace(~r/<br\s?\/?>/, "\n") |> String.replace(~r/<br\s?\/?>/, "\n")
|> HTML.strip_tags() |> HTML.strip_tags()
end
reply_parent = Activity.get_in_reply_to_activity(activity) reply_parent = Activity.get_in_reply_to_activity(activity)
......
  • Guys I'm not sure if this worked. My blank lines post broke more than smug(smug is outdated) and I think new versions of bleroma were among those affected. Would need confirmation though.

    Fuck whoever lied to me about it only affecting outdated smug now. ;_;

  • Blank lines posts have nothing to do with this one, but is probably related to #481 (closed)

    Also please comment on MRs or Issues instead of commits.

Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment