X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcommunity.php;h=174330401019dd544af812de5101bdb42bc1bbfe;hb=8bdc906013461464b475c4f10918adff8730dea6;hp=c8f04d8bd619e67bea2afe626065c20b0c1e3a60;hpb=fb676335dbfb90d282622a68cb9a7113be19bc31;p=friendica.git

diff --git a/mod/community.php b/mod/community.php
index c8f04d8bd6..1743304010 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -1,7 +1,7 @@
 <?php
 
-function community_init(&$a) {
-	if(! local_user()) {
+function community_init(App $a) {
+	if (! local_user()) {
 		unset($_SESSION['theme']);
 		unset($_SESSION['mobile-theme']);
 	}
@@ -10,7 +10,7 @@ function community_init(&$a) {
 }
 
 
-function community_content(&$a, $update = 0) {
+function community_content(App $a, $update = 0) {
 
 	$o = '';
 
@@ -48,27 +48,6 @@ function community_content(&$a, $update = 0) {
 	// Only public posts can be shown
 	// OR your own posts if you are a logged in member
 
-	if(get_config('system', 'old_pager')) {
-		$r = qu("SELECT COUNT(distinct(`item`.`uri`)) AS `total`
-			FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-			INNER JOIN `user` ON `user`.`uid` = `item`.`uid` AND `user`.`hidewall` = 0
-			WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
-			AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
-			AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
-			AND `item`.`private` = 0 AND `item`.`wall` = 1"
-		);
-
-		if (dbm::is_result($r))
-			$a->set_pager_total($r[0]['total']);
-
-		if(! $r[0]['total']) {
-			info( t('No results.') . EOL);
-			return $o;
-		}
-
-	}
-
 	$r = community_getitems($a->pager['start'], $a->pager['itemspage']);
 
 	if (! dbm::is_result($r)) {
@@ -105,13 +84,9 @@ function community_content(&$a, $update = 0) {
 
 	// we behave the same in message lists as the search module
 
-	$o .= conversation($a,$s,'community',$update);
+	$o .= conversation($a, $s, 'community', $update);
 
-	if(!get_config('system', 'old_pager')) {
-	        $o .= alt_pager($a,count($r));
-	} else {
-	        $o .= paginate($a);
-	}
+        $o .= alt_pager($a, count($r));
 
 	return $o;
 }
@@ -121,7 +96,7 @@ function community_getitems($start, $itemspage) {
 		return(community_getpublicitems($start, $itemspage));
 
 	$r = qu("SELECT %s
-		FROM `thread` FORCE INDEX (`wall_private_received`)
+		FROM `thread`
 		INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall`
 		INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
 		AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''