Remove redundant htmlentities/htmlspecialchars

[friendica.git] / mod / notes.php

diff --git a/mod/notes.php b/mod/notes.php
index 55a92f8e64f674fc34716f0d656d174f238f7ea1..90afa16ca537db09b91ff69759803eace473a952 100644 (file)
--- 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;
@@ -58,25 +59,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->setPagerItemsPage(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;
 }