From 5743bb0daec2f91f06689c84a69c8d7315311c51 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 21 Jun 2018 08:23:35 +0000 Subject: [PATCH] Fix Issue 5252 --- mod/search.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/mod/search.php b/mod/search.php index 0790098a5..d64ce7d0e 100644 --- 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,9 +211,13 @@ function search_content(App $a) { } dba::close($terms); - $params = ['order' => ['id' => true]]; - $items = Item::selectForUser(local_user(), [], ['id' => $itemids], $params); - $r = dba::inArray($items); + if (!empty($itemids)) { + $params = ['order' => ['id' => true]]; + $items = Item::selectForUser(local_user(), [], ['id' => $itemids], $params); + $r = dba::inArray($items); + } else { + $r = []; + } } else { logger("Start fulltext search for '".$search."'", LOGGER_DEBUG); @@ -251,4 +255,3 @@ function search_content(App $a) { return $o; } -