Merge pull request #1 from friendica/develop

[friendica.git] / mod / notes.php

diff --git a/mod/notes.php b/mod/notes.php
index 68a870e9d689f282aa4c1a93444bb1d1a3fa68c4..1f67e486d6a6d06ab98bddb4116dd70874575611 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;
@@ -16,13 +17,7 @@ function notes_init(App $a)
                return;
        }
 
-       $profile = 0;
-
-       $which = $a->user['nickname'];
-
        Nav::setSelected('home');
-
-       //Profile::load($a, $which, $profile);
 }
 
 
@@ -33,10 +28,7 @@ function notes_content(App $a, $update = false)
                return;
        }
 
-       require_once 'include/security.php';
-       require_once 'include/conversation.php';
-
-       $o = Profile::getTabs($a, true);
+       $o = Profile::getTabs($a, 'notes', true);
 
        if (!$update) {
                $o .= '<h3>' . L10n::t('Personal Notes') . '</h3>';
@@ -59,22 +51,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)) {
-               $count = count($r);
-               $o .= conversation($a, DBA::toArray($r), 'notes', $update);
+               $notes = Item::inArray($r);
+
+               $count = count($notes);
+
+               $o .= conversation($a, $notes, $pager, 'notes', $update);
        }
 
-       $o .= alt_pager($a, $count);
+       $o .= $pager->renderMinimal($count);
 
        return $o;
 }