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 d342892e1a4f8ad76f5644584eedfc80dfac3955..1a7d4bf61f41b63b453bc498308166d73c50e53a 100644 (file)
--- a/src/Module/Search/Index.php
+++ b/src/Module/Search/Index.php
@@ -34,7 +34,6 @@ 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;
@@ -171,8 +170,10 @@ class Index extends BaseSearch
                }
 
                if (!empty($uriids)) {
-                       $params = ['order' => ['id' => true], 'group_by' => ['uri-id']];
-                       $items = Post::toArray(Post::selectForUser(local_user(), Item::DISPLAY_FIELDLIST, ['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)) {