diff options
| author | Haelwenn <git.pleroma.social@hacktivis.me> | 2018-11-01 14:14:05 +0000 |
|---|---|---|
| committer | Haelwenn <git.pleroma.social@hacktivis.me> | 2018-11-01 14:14:05 +0000 |
| commit | f114f843248d207ff240b018a774ce32c34b6eaf (patch) | |
| tree | cc8bba0031422f1bcc8f33c7e6cc9fc9d7e2b826 | |
| parent | 4fab4e9ba44cdedccb9cf92a0d9b590a654bba69 (diff) | |
| parent | 3c7d4ff27100420f69e68fb256a2181a1a35a4a7 (diff) | |
| download | pleroma-f114f843248d207ff240b018a774ce32c34b6eaf.tar.gz | |
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
| -rw-r--r-- | lib/pleroma/web/twitter_api/views/activity_view.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/views/activity_view.ex b/lib/pleroma/web/twitter_api/views/activity_view.ex index 8e8b3f5ed..83e8fb765 100644 --- a/lib/pleroma/web/twitter_api/views/activity_view.ex +++ b/lib/pleroma/web/twitter_api/views/activity_view.ex @@ -287,7 +287,7 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do summary = object["name"] || object["summary"] 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"]}" else object["content"] |