warning cleanup

diff --git a/include/text.php b/include/text.php
index 0b825cc39940c4017a1087162cfa56a91db0347d..f758c37ee6eb8086803aa592640f65b82680a60d 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -205,7 +205,6 @@ function hex2bin($s) {
                return '';
 
        if(! ctype_xdigit($s)) {
-               logger('hex2bin: illegal input: ' . print_r(debug_backtrace(), true));
                return($s);
        }
 

diff --git a/mod/search.php b/mod/search.php
index 50e7a6abc7abea7cae84f3f57d13d3402042cbfa..6495fc8e5f725514268189db8d30c5dfe8f4b894 100755 (executable)
--- a/mod/search.php
+++ b/mod/search.php
@@ -97,19 +97,16 @@ function search_content(&$a) {
        // OR your own posts if you are a logged in member
        // No items will be shown if the member has a blocked profile wall. 
 
-       $s_regx  = sprintf("AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' )", 
-               dbesc(preg_quote($search)), dbesc('\\]' . preg_quote($search) . '\\['));
-
-       $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`
                WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
                AND (( `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0) 
                        OR `item`.`uid` = %d )
                AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-               $search_alg ",
-               intval(local_user())
+               AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' )", 
+               intval(local_user()),
+               dbesc(preg_quote($search)), 
+               dbesc('\\]' . preg_quote($search) . '\\[')
        );
 
        if(count($r))
@@ -131,9 +128,11 @@ function search_content(&$a) {
                AND (( `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0 ) 
                        OR `item`.`uid` = %d )
                AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-               $search_alg
+               AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' ) 
                ORDER BY `received` DESC LIMIT %d , %d ",
                intval(local_user()),
+               dbesc(preg_quote($search)), 
+               dbesc('\\]' . preg_quote($search) . '\\['),
                intval($a->pager['start']),
                intval($a->pager['itemspage'])