Merge pull request #5776 from annando/fix-contact

[friendica.git] / mod / notes.php

diff --git a/mod/notes.php b/mod/notes.php
index f83195ff1ccdb1e1a16f75375d8df20bd1b27ad9..01f283870ef8ec2ed119d84a458fd2db67d7e33d 100644 (file)
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -7,7 +7,6 @@ use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Core\L10n;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
 
@@ -60,30 +59,25 @@ function notes_content(App $a, $update = false)
        }
 
        $condition = ['uid' => local_user(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => GRAVITY_PARENT,
-               'wall' => false, 'allow_cid' => '<' . $a->contact['id'] . '>', 'contact-id'=> $a->contact['id']];
+               'wall' => false, 'contact-id'=> $a->contact['id']];
 
        $a->set_pager_itemspage(40);
 
        $params = ['order' => ['created' => true],
                'limit' => [$a->pager['start'], $a->pager['itemspage']]];
-       $r = Item::selectForUser(local_user(), ['id'], $condition, $params);
-
-       if (DBM::is_result($r)) {
-               $parents_arr = [];
-
-               while ($rr = Item::fetch($r)) {
-                       $parents_arr[] = $rr['id'];
-               }
-               DBA::close($r);
-
-               $condition = ['uid' => local_user(), 'parent' => $parents_arr];
-               $result = Item::selectForUser(local_user(), [], $condition);
-               if (DBM::is_result($result)) {
-                       $items = conv_sort(Item::inArray($result), 'commented');
-                       $o .= conversation($a, $items, 'notes', $update);
-               }
+       $r = Item::selectThreadForUser(local_user(), ['uri'], $condition, $params);
+
+       $count = 0;
+
+       if (DBA::isResult($r)) {
+               $notes = DBA::toArray($r);
+
+               $count = count($notes);
+
+               $o .= conversation($a, $notes, 'notes', $update);
        }
 
-       $o .= alt_pager($a, count($r));
+       $o .= alt_pager($a, $count);
+
        return $o;
 }