X-Git-Url: https://reisub.nsupdate.info/git/?a=blobdiff_plain;f=mod%2Fnotes.php;h=01f283870ef8ec2ed119d84a458fd2db67d7e33d;hb=382a7f5acdd2ff0f995f760ce7a8173ad01761fa;hp=fb42408c60387a8cbc11f994d61a7ba5884cd399;hpb=d71281e45b6398119ecb09d47dd8947c9e41d15b;p=friendica.git%2F.git

diff --git a/mod/notes.php b/mod/notes.php
index fb42408c60..01f283870e 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -2,12 +2,13 @@
 /**
  * @file mod/notes.php
  */
+
 use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Core\L10n;
-use Friendica\Database\DBM;
-use Friendica\Model\Profile;
+use Friendica\Database\DBA;
 use Friendica\Model\Item;
+use Friendica\Model\Profile;
 
 function notes_init(App $a)
 {
@@ -57,35 +58,26 @@ function notes_content(App $a, $update = false)
 		$o .= status_editor($a, $x, $a->contact['id']);
 	}
 
-	$condition = ["`uid` = ? AND `type` = 'note' AND `id` = `parent` AND NOT `wall`
-		AND `allow_cid` = ? AND `contact-id` = ?",
-		local_user(), '<' . $a->contact['id'] . '>', $a->contact['id']];
+	$condition = ['uid' => local_user(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => GRAVITY_PARENT,
+		'wall' => false, 'contact-id'=> $a->contact['id']];
 
-	$notes = dba::count('item', $condition);
-
-	$a->set_pager_total($notes);
 	$a->set_pager_itemspage(40);
 
 	$params = ['order' => ['created' => true],
 		'limit' => [$a->pager['start'], $a->pager['itemspage']]];
-	$r = Item::select(local_user(), ['item_id'], $condition, $params);
-
-	if (DBM::is_result($r)) {
-		$parents_arr = [];
-
-		while ($rr = dba::fetch($r)) {
-			$parents_arr[] = $rr['item_id'];
-		}
-		dba::close($r);
-
-		$condition = ['uid' => local_user(), 'parent' => $parents_arr];
-		$result = Item::select(local_user(), [], $condition);
-		if (DBM::is_result($result)) {
-			$items = conv_sort(dba::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 .= paginate($a);
+	$o .= alt_pager($a, $count);
+
 	return $o;
 }