clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix fatal errors, caused by an empty "verb"

This commit is contained in:
Michael Vogel 2019-11-18 07:39:56 +01:00
parent 3ba9aa0e8e
commit bd6774bd9b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/conversation.php
View File

@ -402,7 +402,7 @@ function visible_activity($item) {
/** @var Activity $activity */ /** @var Activity $activity */
$activity = BaseObject::getClass(Activity::class); $activity = BaseObject::getClass(Activity::class);
if ($activity->isHidden($item['verb'])) { if (empty($item['verb']) || $activity->isHidden($item['verb'])) {
return false; return false;
} }
@ -1034,7 +1034,7 @@ function builtin_activity_puller($item, &$conv_responses) {
/** @var Activity $activity */ /** @var Activity $activity */
$activity = BaseObject::getClass(Activity::class); $activity = BaseObject::getClass(Activity::class);
if ($activity->match($item['verb'], $verb) && ($item['id'] != $item['parent'])) { if (!empty($item['verb']) && $activity->match($item['verb'], $verb) && ($item['id'] != $item['parent'])) {
$author = ['uid' => 0, 'id' => $item['author-id'], $author = ['uid' => 0, 'id' => $item['author-id'],
'network' => $item['author-network'], 'url' => $item['author-link']]; 'network' => $item['author-network'], 'url' => $item['author-link']];
$url = Contact::magicLinkByContact($author); $url = Contact::magicLinkByContact($author);