From f6c3974c8f5c4038f234ba5c4c2189e6841c4554 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 13 Dec 2018 20:09:19 +0000 Subject: [PATCH] Issue 6257: Make notes visible again --- include/conversation.php | 2 +- mod/notes.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 839b58b871..b129b7d14d 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -497,7 +497,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ } } } elseif ($mode === 'notes') { - $items = conversation_add_children($items, false, $order, $uid); + $items = conversation_add_children($items, false, $order, local_user()); $profile_owner = local_user(); if (!$update) { diff --git a/mod/notes.php b/mod/notes.php index 01e6e5ab99..90afa16ca5 100644 --- a/mod/notes.php +++ b/mod/notes.php @@ -59,7 +59,7 @@ 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']]; $pager = new Pager($a->query_string, 40); @@ -70,7 +70,7 @@ function notes_content(App $a, $update = false) $count = 0; if (DBA::isResult($r)) { - $notes = DBA::toArray($r); + $notes = Item::inArray($r); $count = count($notes);