add simple option for HTTPS in .htaccess

[friendica.git] / mod / msearch.php

diff --git a/mod/msearch.php b/mod/msearch.php
index 541fd2c7e7b0d2d361b640b2f45b7b6966354271..89de5b70576f354653ad4daf8645d5aa5b843876 100644 (file)
--- a/mod/msearch.php
+++ b/mod/msearch.php
@@ -10,13 +10,13 @@ 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))
                $total = $r[0]['total'];
 
-       $r = q("SELECT `pub_keywords`, `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)
@@ -28,8 +28,8 @@ function msearch_post(&$a) {
                        $results[] = array(
                                'name' => $rr['name'], 
                                'url' => $a->get_baseurl() . '/profile/' . $rr['nickname'], 
-                               'photo' => $a->get_baseurl() . '/photo/avatar/' . $rr['uid'] . 'jpg'
-                               'tags' => str_replace(array(',','  '),array(' ',' '),$rr['pub_keywords']);
+                               'photo' => $a->get_baseurl() . '/photo/avatar/' . $rr['uid'] . '.jpg',
+                               'tags' => str_replace(array(',','  '),array(' ',' '),$rr['pub_keywords'])
                        );
        }