From 5f0b43485a9bab882f6ac6a0c7c7667f9f2a188a Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 4 May 2011 20:49:11 -0700
Subject: [PATCH] incorrect count of total pages in normal view mode

---
 boot.php        | 2 +-
 mod/network.php | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/boot.php b/boot.php
index 263d76f620..67e3d65ae1 100644
--- 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 8846b80864..7ad5058bf8 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'])
 	);