Merge remote-tracking branch 'upstream/develop' into 1504-condensed-notifications

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index 405edd3c49dedba39dee250112459c8db8c9326b..6545ab458bc87936067436adae5c2ffceb9f0658 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -22,24 +22,24 @@ function ping_init(&$a) {
 
                $firehose = intval(get_pconfig(local_user(),'system','notify_full'));
 
-               $t = q("select count(*) as total from notify where uid = %d and seen = 0",
+               $t = q("select count(*) as `total` from `notify` where `uid` = %d and `seen` = 0 AND `msg` != '' GROUP BY `parent`",
                        intval(local_user())
                );
                if($t && intval($t[0]['total']) > 49) {
-                       $z = q("select * from notify where uid = %d
-                               and seen = 0 order by date desc limit 0, 50",
+                       $z = q("select * from notify where uid = %d AND `msg` != ''
+                               and seen = 0 GROUP BY `parent` order by date desc limit 0, 50",
                                intval(local_user())
                        );
                        $sysnotify = $t[0]['total'];
                }
                else {
-                       $z1 = q("select * from notify where uid = %d
-                               and seen = 0 order by date desc limit 0, 50",
+                       $z1 = q("select * from notify where uid = %d AND `msg` != ''
+                               and seen = 0 GROUP BY `parent` order by date desc limit 0, 50",
                                intval(local_user())
                        );
 
-                       $z2 = q("select * from notify where uid = %d
-                               and seen = 1 order by date desc limit 0, %d",
+                       $z2 = q("select * from notify where uid = %d AND `msg` != ''
+                               and seen = 1 GROUP BY `parent` order by date desc limit 0, %d",
                                intval(local_user()),
                                intval(50 - intval($t[0]['total']))
                        );