Merge pull request #6432 from annando/deleted-pending

[friendica.git] / mod / notes.php

diff --git a/mod/notes.php b/mod/notes.php
index 01e6e5ab991d7712343ab746bfb432aa8c517b9d..6ecc819240ff67d817f27dc9ee91c7aa540d61ec 100644 (file)
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -34,8 +34,6 @@ function notes_content(App $a, $update = false)
                return;
        }
 
-       require_once 'include/conversation.php';
-
        $o = Profile::getTabs($a, true);
 
        if (!$update) {
@@ -59,7 +57,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 +68,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);