Frio: new photos upload template (#5637)

[friendica.git] / mod / notes.php

diff --git a/mod/notes.php b/mod/notes.php
index f83195ff1ccdb1e1a16f75375d8df20bd1b27ad9..608d01cf8c63fbf1ed718788ab0eba5f5ffd3db6 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,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, 'allow_cid' => '<' . $a->contact['id'] . '>', 'contact-id'=> $a->contact['id']];
+               'wall' => false, 'contact-id'=> $a->contact['id']];
 
        $a->set_pager_itemspage(40);
 
@@ -68,7 +67,10 @@ function notes_content(App $a, $update = false)
                'limit' => [$a->pager['start'], $a->pager['itemspage']]];
        $r = Item::selectForUser(local_user(), ['id'], $condition, $params);
 
-       if (DBM::is_result($r)) {
+       $count = 0;
+
+       if (DBA::isResult($r)) {
+               $count = count($r);
                $parents_arr = [];
 
                while ($rr = Item::fetch($r)) {
@@ -78,12 +80,14 @@ function notes_content(App $a, $update = false)
 
                $condition = ['uid' => local_user(), 'parent' => $parents_arr];
                $result = Item::selectForUser(local_user(), [], $condition);
-               if (DBM::is_result($result)) {
+
+               if (DBA::isResult($result)) {
                        $items = conv_sort(Item::inArray($result), 'commented');
                        $o .= conversation($a, $items, 'notes', $update);
                }
        }
 
-       $o .= alt_pager($a, count($r));
+       $o .= alt_pager($a, $count);
+
        return $o;
 }