Merge remote-tracking branch 'friendica/master'

[friendica.git] / mod / search.php

diff --git a/mod/search.php b/mod/search.php
index e2c365fd3ace99bbff38ebb5475db0411e70e265..3f98b607f0dd92ab0a0a179eee25337fa9c37670 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -4,7 +4,7 @@ function search_saved_searches() {
 
        $o = '';
 
-       $r = q("select `term` from `search` WHERE `uid` = %d",
+       $r = q("select `id`,`term` from `search` WHERE `uid` = %d",
                intval(local_user())
        );
 
@@ -96,16 +96,10 @@ function search_content(&$a) {
        // Only public wall posts can be shown
        // OR your own posts if you are a logged in member
 
-
-//     $s_bool  = sprintf("AND MATCH (`item`.`body`) AGAINST ( '%s' IN BOOLEAN MODE )", dbesc($search));
        $s_regx  = sprintf("AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' )", 
-               dbesc($search), dbesc('\\]' . $search . '\\['));
-
-//     if(mb_strlen($search) >= 3)
-//             $search_alg = $s_bool;
-//     else
+               dbesc(preg_quote($search)), dbesc('\\]' . preg_quote($search) . '\\['));
 
-               $search_alg = $s_regx;
+       $search_alg = $s_regx;
 
        $r = q("SELECT COUNT(*) AS `total`
                FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`