strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move $pager and $page_offset out of App

Browse source 
- Move infinite scroll data output in a module hook
- Use Pager instead of paginate() and alt_pager()
This commit is contained in:
Hypolite Petovan 2018-10-24 02:15:24 -04:00
commit 14237a9599
29 changed files with 234 additions and 385 deletions
Download patch file Download diff file Expand all files Collapse all files

14
mod/match.php
View file

@ -4,6 +4,7 @@
*/
use Friendica\App;
use Friendica\Content\Pager;
use Friendica\Content\Widget;
use Friendica\Core\Config;
use Friendica\Core\L10n;
@ -54,8 +55,8 @@ function match_content(App $a)
if ($tags) {
$params['s'] = $tags;
if ($a->pager['page'] != 1) {
$params['p'] = $a->pager['page'];
if ($pager->getPage() != 1) {
$params['p'] = $pager->getPage();
}
if (strlen(Config::get('system', 'directory'))) {
@ -66,12 +67,9 @@ function match_content(App $a)
$j = json_decode($x);
if ($j->total) {
$a->setPagerTotal($j->total);
$a->setPagerItemsPage($j->items_page);
}
if (count($j->results)) {
$pager = new Pager($a->query_string, $j->total, $j->items_page);
$id = 0;
foreach ($j->results as $jj) {
@ -119,7 +117,7 @@ function match_content(App $a)
[
'$title' => L10n::t('Profile Match'),
'$contacts' => $entries,
'$paginate' => paginate($a)]
'$paginate' => $pager->renderFull()]
);
} else {
info(L10n::t('No matches') . EOL);