From 4168d47ecd9235e3d14c45766244cf45f80b3e15 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 26 Mar 2017 05:29:24 +0000 Subject: [PATCH] Issue 3248: Make communityhome work again. --- mod/community.php | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/mod/community.php b/mod/community.php index 1743304010..45326e291d 100644 --- a/mod/community.php +++ b/mod/community.php @@ -1,12 +1,12 @@ ' . t('Community') . ''; - if(! $update) { + if (! $update) { nav_set_selected('community'); } - if(x($a->data,'search')) + if (x($a->data,'search')) { $search = notags(trim($a->data['search'])); - else + } else { $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : ''); - + } // Here is the way permissions work in this module... // Only public posts can be shown @@ -55,7 +51,7 @@ function community_content(App $a, $update = 0) { return $o; } - $maxpostperauthor = get_config('system','max_author_posts_community_page'); + $maxpostperauthor = Config::get('system','max_author_posts_community_page'); if ($maxpostperauthor != 0) { $count = 1; @@ -65,23 +61,24 @@ function community_content(App $a, $update = 0) { do { foreach ($r AS $row=>$item) { - if ($previousauthor == $item["author-link"]) + if ($previousauthor == $item["author-link"]) { ++$numposts; - else + } else { $numposts = 0; - + } $previousauthor = $item["author-link"]; - if (($numposts < $maxpostperauthor) AND (sizeof($s) < $a->pager['itemspage'])) + if (($numposts < $maxpostperauthor) AND (sizeof($s) < $a->pager['itemspage'])) { $s[] = $item; + } } - if ((sizeof($s) < $a->pager['itemspage'])) + if ((sizeof($s) < $a->pager['itemspage'])) { $r = community_getitems($a->pager['start'] + ($count * $a->pager['itemspage']), $a->pager['itemspage']); - + } } while ((sizeof($s) < $a->pager['itemspage']) AND (++$count < 50) AND (sizeof($r) > 0)); - } else + } else { $s = $r; - + } // we behave the same in message lists as the search module $o .= conversation($a, $s, 'community', $update); @@ -92,9 +89,9 @@ function community_content(App $a, $update = 0) { } function community_getitems($start, $itemspage) { - if (get_config('system','community_page_style') == CP_GLOBAL_COMMUNITY) + if (Config::get('system','community_page_style') == CP_GLOBAL_COMMUNITY) { return(community_getpublicitems($start, $itemspage)); - + } $r = qu("SELECT %s FROM `thread` INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall`