Merge pull request #11973 from MrPetovan/task/test-fixDateFormat

[friendica.git] / mod / msearch.php

diff --git a/mod/msearch.php b/mod/msearch.php
index ce440d1ee25c86cf0a9164e8dbd8fd9d3b14124a..00a72ea9f72171f75470ae3042fd7c7109192057 100644 (file)
--- a/mod/msearch.php
+++ b/mod/msearch.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -20,6 +20,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\User;
@@ -37,28 +38,13 @@ function msearch_post(App $a)
 
        if (!strlen($search)) {
                $output = ['total' => 0, 'items_page' => $perpage, 'page' => $page, 'results' => $results];
-               echo json_encode($output);
-               exit();
+               System::jsonExit($output);
        }
 
        $total = 0;
 
        $condition = ["`net-publish` AND MATCH(`pub_keywords`) AGAINST (?)", $search];
        $total = DBA::count('owner-view', $condition);
-       $count_stmt = DBA::p(
-               "SELECT COUNT(*) AS `total`
-                       FROM `profile`
-                       JOIN `user` ON `user`.`uid` = `profile`.`uid`
-                       WHERE `profile`.`net-publish`
-                       AND MATCH(`pub_keywords`) AGAINST (?)",
-               $search
-       );
-       if (DBA::isResult($count_stmt)) {
-               $row = DBA::fetch($count_stmt);
-               $total = $row['total'];
-       }
-
-       DBA::close($count_stmt);
 
        $search_stmt = DBA::select('owner-view', ['pub_keywords', 'name', 'nickname', 'uid'], $condition, ['limit' => [$startrec, $perpage]]);
        while ($search_result = DBA::fetch($search_stmt)) {
@@ -74,7 +60,5 @@ function msearch_post(App $a)
 
        $output = ['total' => $total, 'items_page' => $perpage, 'page' => $page, 'results' => $results];
 
-       echo json_encode($output);
-
-       exit();
+       System::jsonExit($output);
 }