Merge pull request #10338 from annando/issue-9923

[friendica.git] / src / Module / Search / Index.php

diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php
index 67534a61abf89520bc71fca1b967ae4a7e14afa2..1a7d4bf61f41b63b453bc498308166d73c50e53a 100644 (file)
--- a/src/Module/Search/Index.php
+++ b/src/Module/Search/Index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -34,7 +34,7 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
-use Friendica\Model\ItemContent;
+use Friendica\Model\Post;
 use Friendica\Model\Tag;
 use Friendica\Module\BaseSearch;
 use Friendica\Network\HTTPException;
@@ -165,13 +165,15 @@ class Index extends BaseSearch
                        $count = Tag::countByTag($search, local_user());
                } else {
                        Logger::info('Start fulltext search.', ['q' => $search]);
-                       $uriids = ItemContent::getURIIdListBySearch($search, local_user(), $pager->getStart(), $pager->getItemsPerPage(), $last_uriid);
-                       $count = ItemContent::countBySearch($search, local_user());
+                       $uriids = Post\Content::getURIIdListBySearch($search, local_user(), $pager->getStart(), $pager->getItemsPerPage(), $last_uriid);
+                       $count = Post\Content::countBySearch($search, local_user());
                }
 
                if (!empty($uriids)) {
-                       $params = ['order' => ['id' => true], 'group_by' => ['uri-id']];
-                       $items = Item::inArray(Item::selectForUser(local_user(), [], ['uri-id' => $uriids], $params));
+                       $condition = ["(`uid` = ? OR (`uid` = ? AND NOT `global`))", 0, local_user()];
+                       $condition = DBA::mergeConditions($condition, ['uri-id' => $uriids]);
+                       $params = ['order' => ['id' => true]];
+                       $items = Post::toArray(Post::selectForUser(local_user(), Item::DISPLAY_FIELDLIST, $condition, $params));
                }
 
                if (empty($items)) {
@@ -288,7 +290,7 @@ class Index extends BaseSearch
                }
 
                if (!empty($item_id)) {
-                       $item = Item::selectFirst(['guid'], ['id' => $item_id]);
+                       $item = Post::selectFirst(['guid'], ['id' => $item_id]);
                        if (DBA::isResult($item)) {
                                DI::baseUrl()->redirect('display/' . $item['guid']);
                        }