jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #7842 from annando/fix-fatal

Browse source 
Fix fatal errors, caused by an empty "verb"
This commit is contained in:
Philipp 2019-11-18 08:38:32 +01:00 committed by GitHub
commit db65601828
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 */
$activity = BaseObject::getClass(Activity::class);
if ($activity->isHidden($item['verb'])) {
if (empty($item['verb']) || $activity->isHidden($item['verb'])) {
return false;
}
@ -1034,7 +1034,7 @@ function builtin_activity_puller($item, &$conv_responses) {
/** @var Activity $activity */
$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'],
'network' => $item['author-network'], 'url' => $item['author-link']];
$url = Contact::magicLinkByContact($author);