diff options
| author | Michael <icarus@dabo.de> | 2012-02-27 00:03:51 +0100 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-02-27 00:03:51 +0100 |
| commit | 18679111f5aed8f1c5e7ccb9857195e52c57765d (patch) | |
| tree | bffb4a563ed2fe1ff02a4221e28c608460c866db /mod/ping.php | |
| parent | fe3dfbee5638dd2988bd8b126652b3138572f02c (diff) | |
| parent | 6ddd444afde33337235eab3aa9d6d1fe12bcb7a4 (diff) | |
| download | volse-hubzilla-18679111f5aed8f1c5e7ccb9857195e52c57765d.tar.gz volse-hubzilla-18679111f5aed8f1c5e7ccb9857195e52c57765d.tar.bz2 volse-hubzilla-18679111f5aed8f1c5e7ccb9857195e52c57765d.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/ping.php')
| -rw-r--r-- | mod/ping.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mod/ping.php b/mod/ping.php index 0f6f0a9d6..7380ff7d0 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -26,9 +26,10 @@ function ping_init(&$a) { $dislikes = array(); $friends = array(); $posts = array(); - + $home = 0; + $network = 0; - $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, + $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`, `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` |