Merge pull request #3965 from tobiasd/20171126-docGettingStarted

[friendica.git] / mod / qsearch.php

diff --git a/mod/qsearch.php b/mod/qsearch.php
index cffc3e50ba91256f4a854a03d83887b6a1c178c3..167ee415124fc73530b8fad5e69f2c3f85e25621 100644 (file)
--- a/mod/qsearch.php
+++ b/mod/qsearch.php
@@ -1,12 +1,16 @@
 <?php
 
-if(! function_exists('qsearch_init')) {
-function qsearch_init(&$a) {
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
-       if(! local_user())
+function qsearch_init(App $a) {
+
+       if (! local_user()) {
                killme();
+       }
 
-       $limit = (get_config('system','qsearch_limit') ? intval(get_config('system','qsearch_limit')) : 100);
+       $limit = (Config::get('system','qsearch_limit') ? intval(Config::get('system','qsearch_limit')) : 100);
 
        $search = ((x($_GET,'s')) ? notags(trim(urldecode($_GET['s']))) : '');
 
@@ -24,7 +28,7 @@ function qsearch_init(&$a) {
                intval($limit)
        );
 
-       if(count($r)) {
+       if (DBM::is_result($r)) {
 
                foreach($r as $rr)
                        $results[] = array( 0, (int) $rr['id'], $rr['name'], '', '');
@@ -39,7 +43,7 @@ function qsearch_init(&$a) {
        );
 
 
-       if(count($r)) {
+       if (DBM::is_result($r)) {
 
                foreach($r as $rr)
                        $results[] = array( (int) $rr['id'], 0, $rr['name'],$rr['url'],$rr['photo']);
@@ -48,4 +52,3 @@ function qsearch_init(&$a) {
        echo json_encode((object) $results);
        killme();
 }
-}