merged from develop and increased DB-version

[friendica.git] / mod / search.php

diff --git a/mod/search.php b/mod/search.php
index c42bcacfa007a3d675b0afea56ed8ef0b674f3ca..974680d2a087d39ab838aa1f675eab8352be5f42 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -21,7 +21,7 @@ function search_saved_searches() {
        $o = '';
        $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
-       if (! Feature::isEnabled(local_user(),'savedsearch'))
+       if (!Feature::isEnabled(local_user(),'savedsearch'))
                return $o;
 
        $r = q("SELECT `id`,`term` FROM `search` WHERE `uid` = %d",
@@ -184,7 +184,7 @@ function search_content(App $a) {
                                break;
                }
 
-       if (! $search)
+       if (!$search)
                return $o;
 
        if (Config::get('system','only_tag_search'))
@@ -211,8 +211,13 @@ function search_content(App $a) {
                }
                dba::close($terms);
 
-               $items = Item::select(local_user(), [], ['id' => array_reverse($itemids)]);
-               $r = dba::inArray($items);
+               if (!empty($itemids)) {
+                       $params = ['order' => ['id' => true]];
+                       $items = Item::selectForUser(local_user(), [], ['id' => $itemids], $params);
+                       $r = Item::inArray($items);
+               } else {
+                       $r = [];
+               }
        } else {
                logger("Start fulltext search for '".$search."'", LOGGER_DEBUG);
 
@@ -221,8 +226,8 @@ function search_content(App $a) {
                        local_user(), $search];
                $params = ['order' => ['id' => true],
                        'limit' => [$a->pager['start'], $a->pager['itemspage']]];
-               $items = Item::select(local_user(), [], $condition, $params);
-               $r = dba::inArray($items);
+               $items = Item::selectForUser(local_user(), [], $condition, $params);
+               $r = Item::inArray($items);
        }
 
        if (!DBM::is_result($r)) {
@@ -250,4 +255,3 @@ function search_content(App $a) {
 
        return $o;
 }
-