diff options
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | mod/network.php | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -3,7 +3,7 @@ set_time_limit(0); ini_set('pcre.backtrack_limit', 250000); -define ( 'FRIENDIKA_VERSION', '2.1.968' ); +define ( 'FRIENDIKA_VERSION', '2.1.969' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1054 ); diff --git a/mod/network.php b/mod/network.php index 8846b8086..7ad5058bf 100644 --- a/mod/network.php +++ b/mod/network.php @@ -164,11 +164,13 @@ function network_content(&$a, $update = 0) { if((! $group) && (! $cid) && (! $update)) $o .= get_birthdays(); + $sql_extra2 = (($nouveau) ? '' : " AND `item`.`parent` = `item`.`id` "); $r = q("SELECT COUNT(*) AS `total` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + $sql_extra2 $sql_extra ", intval($_SESSION['uid']) ); |