Merge pull request #646 from annando/master

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index 2698956d7ddd104d5b75c62a37dda39b833dca85..a5bf315b5bb6ecc530b090f976475337b59bfc77 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -60,17 +60,20 @@ function ping_init(&$a) {
                $network = 0;
 
                $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`, 
-                               `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`, 
+                               `item`.`contact-id`, `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`, 
                                `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` 
                                FROM `item` INNER JOIN `item` as `pitem` ON  `pitem`.`id`=`item`.`parent`
-                               WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
-                                `item`.`deleted` = 0 AND `item`.`uid` = %d 
+                               WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND 
+                                `item`.`deleted` = 0 AND `item`.`uid` = %d AND `pitem`.`parent` != 0
                                ORDER BY `item`.`created` DESC",
                        intval(local_user())
                );
 
                if(count($r)) {         
 
+                       $arr = array('items' => $r);
+                       call_hooks('network_ping', $arr);
+
                        foreach ($r as $it) {
 
                                if($it['wall'])