X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fping.php;h=6b3b015ac80e32bcc09839dad0d5e534ea826061;hb=04c95a5045136cb18d09f0ae6f9cb46975dace13;hp=168b508ea02468dac5761cf48f6613c0bcb57e79;hpb=ba9cf32f366e06189b9e8eb92ea4bf3b6df8a1b3;p=friendica.git diff --git a/mod/ping.php b/mod/ping.php index 168b508ea0..6b3b015ac8 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -136,7 +136,7 @@ function ping_init(App $a) $notifs = ping_get_notifications(local_user()); - $condition = ["`unseen` AND `uid` = ? AND `contact-id` != ? AND `vid` != ?", + $condition = ["`unseen` AND `uid` = ? AND `contact-id` != ? AND (`vid` != ? OR `vid` IS NULL)", local_user(), local_user(), Verb::getID(Activity::FOLLOW)]; $fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar', 'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid', 'wall', 'activity']; @@ -467,13 +467,13 @@ function ping_get_notifications($uid) if ($notification["visible"] && !$notification["deleted"] - && empty($result[$notification["parent"]]) + && empty($result[$notification['parent']]) ) { // Should we condense the notifications or show them all? if (DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) { $result[$notification["id"]] = $notification; } else { - $result[$notification["parent"]] = $notification; + $result[$notification['parent']] = $notification; } } }