Issue 6257: Make notes visible again

diff --git a/include/conversation.php b/include/conversation.php
index 839b58b871bebf90feba1541003b05150191c50e..b129b7d14d075a492a226355b5bb20b1a4783b66 100644 (file)
--- 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 01e6e5ab991d7712343ab746bfb432aa8c517b9d..90afa16ca537db09b91ff69759803eace473a952 100644 (file)
--- 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);