X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcommunity.php;h=06a96c7403f54ff933efa10c8cbaa1d3406a6830;hb=7d531afd00de35ef55d0cc5caa63242765341dae;hp=a83bd39ec247ac4824b2f37a300623e99e0efda0;hpb=c68f28bc774213bcf7de083d19843d1cc9f7a8d4;p=friendica.git

diff --git a/mod/community.php b/mod/community.php
index a83bd39ec2..06a96c7403 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -120,19 +120,17 @@ function community_getitems($start, $itemspage) {
 	if (get_config('system','community_page_style') == CP_GLOBAL_COMMUNITY)
 		return(community_getpublicitems($start, $itemspage));
 
-	$r = q("SELECT %s, %s, `user`.`nickname`
+	$r = q("SELECT %s
 		FROM `thread` FORCE INDEX (`wall_private_received`)
 		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` = ''
 		AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
-		INNER JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
-		AND %s AND `contact`.`self`
+		%s AND `contact`.`self`
 		WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
 		AND NOT `thread`.`private` AND `thread`.`wall`
 		ORDER BY `thread`.`received` DESC LIMIT %d, %d",
-		item_fieldlist(), contact_fieldlist(),
-		contact_condition(),
+		item_fieldlists(), item_joins(),
 		intval($start), intval($itemspage)
 	);
 
@@ -142,14 +140,13 @@ function community_getitems($start, $itemspage) {
 
 function community_getpublicitems($start, $itemspage) {
 
-	$r = q("SELECT %s, `author-name` AS `name`, `owner-avatar` AS `photo`,
-			`owner-link` AS `url`, `owner-avatar` AS `thumb`
+	$r = q("SELECT %s
 		FROM `thread`
-		INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
+		INNER JOIN `item` ON `item`.`id` = `thread`.`iid` %s
 		WHERE `thread`.`uid` = 0
 		ORDER BY `thread`.`created` DESC LIMIT %d, %d",
-		item_fieldlist(), intval($start),
-		intval($itemspage)
+		item_fieldlists(), item_joins(),
+		intval($start), intval($itemspage)
 	);
 
 	return($r);