Merge branch 'hotfix/prismo-twitterapi' into 'develop'

Pleroma.Web.TwitterAPI.ActivityView: Harden TwitterAPI against remnant of prismo

Closes #353

See merge request pleroma/pleroma!415
This commit is contained in:
Haelwenn 2018-11-01 14:14:05 +00:00
commit f114f84324

View file

@ -287,7 +287,7 @@ def render_content(%{"type" => object_type} = object) when object_type in ["Arti
summary = object["name"] || object["summary"] summary = object["name"] || object["summary"]
content = content =
if !!summary and summary != "" do if !!summary and summary != "" and is_bitstring(object["url"]) do
"<p><a href=\"#{object["url"]}\">#{summary}</a></p>#{object["content"]}" "<p><a href=\"#{object["url"]}\">#{summary}</a></p>#{object["content"]}"
else else
object["content"] object["content"]