Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

[friendica.git] / mod / msearch.php

diff --git a/mod/msearch.php b/mod/msearch.php
index 3b1b0b617ad185765d392e1c6b48d22d7bdc939b..277242afff803f19eecc1241600f849b75ccafdf 100644 (file)
--- a/mod/msearch.php
+++ b/mod/msearch.php
@@ -1,7 +1,6 @@
 <?php
 
-if(! function_exists('msearch_post')) {
-function msearch_post(&$a) {
+function msearch_post(App $a) {
 
        $perpage = (($_POST['n']) ? $_POST['n'] : 80);
        $page = (($_POST['p']) ? intval($_POST['p'] - 1) : 0);
@@ -14,22 +13,24 @@ function msearch_post(&$a) {
        $r = q("SELECT COUNT(*) AS `total` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `user`.`hidewall` = 0 AND MATCH `pub_keywords` AGAINST ('%s') ",
                dbesc($search)
        );
-       if(count($r))
+
+       if (dbm::is_result($r))
                $total = $r[0]['total'];
 
+       $results = array();
+
        $r = q("SELECT `pub_keywords`, `username`, `nickname`, `user`.`uid` FROM `user` LEFT JOIN `profile` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `user`.`hidewall` = 0 AND MATCH `pub_keywords` AGAINST ('%s') LIMIT %d , %d ",
                dbesc($search),
                intval($startrec),
                intval($perpage)
        );
 
-       $results = array();
-       if(count($r)) {
+       if (dbm::is_result($r)) {
                foreach($r as $rr)
                        $results[] = array(
                                'name' => $rr['name'],
-                               'url' => $a->get_baseurl() . '/profile/' . $rr['nickname'],
-                               'photo' => $a->get_baseurl() . '/photo/avatar/' . $rr['uid'] . '.jpg',
+                               'url' => App::get_baseurl() . '/profile/' . $rr['nickname'],
+                               'photo' => App::get_baseurl() . '/photo/avatar/' . $rr['uid'] . '.jpg',
                                'tags' => str_replace(array(',','  '),array(' ',' '),$rr['pub_keywords'])
                        );
        }
@@ -39,5 +40,5 @@ function msearch_post(&$a) {
        echo json_encode($output);
 
        killme();
-}
+
 }