incorrect count of total pages in normal view mode

diff --git a/boot.php b/boot.php
index 263d76f62042015f6f6c673b93a344db7e564aa7..67e3d65ae170e4d2f9a90681b847c1a024ccb430 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -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 8846b808642e75891ab00c98f1b117c986f08e94..7ad5058bf813f8095a329fdba4a4a54c50e534d8 100644 (file)
--- 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'])
        );