X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnetwork.php;h=97f00eeda90ecfb1f3bc665793eac035d96fff6b;hb=5c0f0df59aa661b37c5328eb11ecb48d57f8481d;hp=3d8fa7c1443e4849280017246dcc0a68a1c38f74;hpb=10915b8feb03f1e4c93277d6d2c6f3e0b1f0501e;p=friendica.git

diff --git a/mod/network.php b/mod/network.php
index 3d8fa7c144..97f00eeda9 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -563,20 +563,27 @@ function network_content(&$a, $update = 0) {
 
 	}
 	else {
-		$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_extra3
-			$sql_extra $sql_nets ",
-			intval($_SESSION['uid'])
-		);
-
-		if(count($r)) {
-			$a->set_pager_total($r[0]['total']);
-	                $itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
-                        $a->set_pager_itemspage(((intval($itemspage_network)) ? $itemspage_network : 40));
+		if(! get_pconfig(local_user(),'system','alt_pager')) {
+		        $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_extra3
+			        $sql_extra $sql_nets ",
+			        intval($_SESSION['uid'])
+		        );
+
+		        if(count($r)) {
+			        $a->set_pager_total($r[0]['total']);
+		        }
 		}
+
+		$itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
+		$itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 40);
+		if(($a->force_max_items > 0) && ($a->force_max_items < $itemspage_network))
+			$itemspage_network = $a->force_max_items;
+
+		$a->set_pager_itemspage($itemspage_network);
 		$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
 	}
 
@@ -688,7 +695,12 @@ function network_content(&$a, $update = 0) {
 	$o .= conversation($a,$items,$mode,$update);
 
 	if(! $update) {
-		$o .= paginate($a);
+	        if(! get_pconfig(local_user(),'system','alt_pager')) {
+		        $o .= paginate($a);
+		}
+		else {
+		        $o .= alt_pager($a,count($items));
+		}
 	}
 
 	return $o;