Catch HTTPExceptions in App::runFrontend()

[friendica.git] / mod / notes.php

diff --git a/mod/notes.php b/mod/notes.php
index 01f283870ef8ec2ed119d84a458fd2db67d7e33d..6ecc819240ff67d817f27dc9ee91c7aa540d61ec 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;
@@ -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;
 }