X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcommunity.php;h=36668817323c2357e0c5c1cf09748cc2f3c26a1c;hb=64887387906e9774ef1810c0029353086bcda43b;hp=0eaccc0db0306ead6ead5241690d2f37e524408c;hpb=ec0d3a6eac4b1a1551649253167c6eed96cdd53f;p=friendica.git diff --git a/mod/community.php b/mod/community.php index 0eaccc0db0..3666881732 100644 --- a/mod/community.php +++ b/mod/community.php @@ -5,10 +5,12 @@ use Friendica\App; use Friendica\Content\Nav; +use Friendica\Content\Pager; use Friendica\Core\ACL; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\PConfig; +use Friendica\Core\Renderer; use Friendica\Database\DBA; use Friendica\Model\Contact; use Friendica\Model\Item; @@ -118,8 +120,8 @@ function community_content(App $a, $update = 0) ]; } - $tab_tpl = get_markup_template('common_tabs.tpl'); - $o .= replace_macros($tab_tpl, ['$tabs' => $tabs]); + $tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl'); + $o .= Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]); Nav::setSelected('community'); @@ -153,9 +155,9 @@ function community_content(App $a, $update = 0) $itemspage_network = $a->force_max_items; } - $a->setPagerItemsPage($itemspage_network); + $pager = new Pager($a->query_string, $itemspage_network); - $r = community_getitems($a->pager['start'], $a->pager['itemspage'], $content, $accounttype); + $r = community_getitems($pager->getStart(), $pager->getItemsPerPage(), $content, $accounttype); if (!DBA::isResult($r)) { info(L10n::t('No results.') . EOL); @@ -179,26 +181,26 @@ function community_content(App $a, $update = 0) } $previousauthor = $item["author-link"]; - if (($numposts < $maxpostperauthor) && (count($s) < $a->pager['itemspage'])) { + if (($numposts < $maxpostperauthor) && (count($s) < $pager->getItemsPerPage())) { $s[] = $item; } } - if (count($s) < $a->pager['itemspage']) { - $r = community_getitems($a->pager['start'] + ($count * $a->pager['itemspage']), $a->pager['itemspage'], $content, $accounttype); + if (count($s) < $pager->getItemsPerPage()) { + $r = community_getitems($pager->getStart() + ($count * $pager->getItemsPerPage()), $pager->getItemsPerPage(), $content, $accounttype); } - } while ((count($s) < $a->pager['itemspage']) && ( ++$count < 50) && (count($r) > 0)); + } while ((count($s) < $pager->getItemsPerPage()) && ( ++$count < 50) && (count($r) > 0)); } else { $s = $r; } - $o .= conversation($a, $s, 'community', $update, false, 'commented', local_user()); + $o .= conversation($a, $s, $pager, 'community', $update, false, 'commented', local_user()); if (!$update) { - $o .= alt_pager($a, count($r)); + $o .= $pager->renderMinimal(count($r)); } - $t = get_markup_template("community.tpl"); - return replace_macros($t, [ + $t = Renderer::getMarkupTemplate("community.tpl"); + return Renderer::replaceMacros($t, [ '$content' => $o, '$header' => '', '$show_global_community_hint' => ($content == 'global') && Config::get('system', 'show_global_community_hint'),