Merge pull request #10800 from MrPetovan/task/10739-block

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index bdd30be3fc10100679884a1803df353fb2a8d1c6..69aef1bf3fd54bda79b04c9c8213e7e54e8d1c74 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -459,13 +459,13 @@ function ping_get_notifications($uid)
 
                        if ($notification["visible"]
                                && !$notification["deleted"]
-                               && empty($result[$notification['parent']])
+                               && empty($result['p:' . $notification['parent']])
                        ) {
                                // Should we condense the notifications or show them all?
-                               if (DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) {
-                                       $result[$notification["id"]] = $notification;
+                               if (($notification['verb'] != Activity::POST) || DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) {
+                                       $result[] = $notification;
                                } else {
-                                       $result[$notification['parent']] = $notification;
+                                       $result['p:' . $notification['parent']] = $notification;
                                }
                        }
                }