More usage of dbm::is_result($r) instead of count($r):

[friendica.git] / mod / msearch.php

diff --git a/mod/msearch.php b/mod/msearch.php
index dc94962954c6828ba20d517a7eb3c5f7763f8b97..1370b63bf2ca3e476e4f9c8389b5abd9ae6990a5 100644 (file)
--- a/mod/msearch.php
+++ b/mod/msearch.php
@@ -10,25 +10,26 @@ function msearch_post(&$a) {
        if(! strlen($search))
                killme();
 
-       $r = q("SELECT COUNT(*) AS `total` FROM `profile` WHERE `is-default` = 1 AND `hidewall` = 0 AND MATCH `pub_keywords` AGAINST ('%s') ",
+       $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'];
 
-       $r = q("SELECT `username`, `nickname`, `user`.`uid` FROM `user` LEFT JOIN `profile` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `hidewall` = 0 AND MATCH `pub_keywords` AGAINST ('%s') LIMIT %d , %d ",
+       $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'
+                               'photo' => $a->get_baseurl() . '/photo/avatar/' . $rr['uid'] . '.jpg',
+                               'tags' => str_replace(array(',','  '),array(' ',' '),$rr['pub_keywords'])
                        );
        }