X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotes.php;h=6ecc819240ff67d817f27dc9ee91c7aa540d61ec;hb=89eaf508f19be57a07971c5f40b4bb538e36e891;hp=01f283870ef8ec2ed119d84a458fd2db67d7e33d;hpb=aa2ab3d0e7262fcc9c8c78e4ed943429081af6b0;p=friendica.git diff --git a/mod/notes.php b/mod/notes.php index 01f283870e..6ecc819240 100644 --- a/mod/notes.php +++ b/mod/notes.php @@ -5,6 +5,7 @@ use Friendica\App; use Friendica\Content\Nav; +use Friendica\Content\Pager; use Friendica\Core\L10n; use Friendica\Database\DBA; use Friendica\Model\Item; @@ -33,9 +34,6 @@ function notes_content(App $a, $update = false) return; } - require_once 'include/security.php'; - require_once 'include/conversation.php'; - $o = Profile::getTabs($a, true); if (!$update) { @@ -59,25 +57,25 @@ function notes_content(App $a, $update = false) } $condition = ['uid' => local_user(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => GRAVITY_PARENT, - 'wall' => false, 'contact-id'=> $a->contact['id']]; + 'contact-id'=> $a->contact['id']]; - $a->set_pager_itemspage(40); + $pager = new Pager($a->query_string, 40); $params = ['order' => ['created' => true], - 'limit' => [$a->pager['start'], $a->pager['itemspage']]]; + 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]]; $r = Item::selectThreadForUser(local_user(), ['uri'], $condition, $params); $count = 0; if (DBA::isResult($r)) { - $notes = DBA::toArray($r); + $notes = Item::inArray($r); $count = count($notes); - $o .= conversation($a, $notes, 'notes', $update); + $o .= conversation($a, $notes, $pager, 'notes', $update); } - $o .= alt_pager($a, $count); + $o .= $pager->renderMinimal($count); return $o; }