From 48c5ec9b24e7ad90bf8c6695dd205886cbf46cff Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Wed, 31 Mar 2010 21:37:35 +0000 Subject: [PATCH] Use so_sql::search2criteria() to generate search text filter --- infolog/inc/class.infolog_so.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/infolog/inc/class.infolog_so.inc.php b/infolog/inc/class.infolog_so.inc.php index 681cd5cf52..223e9f3a34 100644 --- a/infolog/inc/class.infolog_so.inc.php +++ b/infolog/inc/class.infolog_so.inc.php @@ -804,8 +804,9 @@ class infolog_so // at the moment MaxDB 7.5 cant cast nor search text columns, it's suppost to change in 7.6 if ($this->db->capabilities['like_on_text']) $columns[] = 'info_des'; + $search = so_sql::search2criteria($query['search'], $wildcard, $op, null, $columns); $sql_query = 'AND ('.(is_numeric($query['search']) ? 'main.info_id='.(int)$query['search'].' OR ' : ''). - implode($pattern.' OR ',$columns).$pattern.') '; + implode($op, $search) .')'; $join = ($cfcolfilter>0 ? '':'LEFT')." JOIN $this->extra_table ON main.info_id=$this->extra_table.info_id "; // mssql and others cant use DISTICT if text columns (info_des) are involved