mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-23 00:13:35 +01:00
Use so_sql::search2criteria() to generate search text filter
This commit is contained in:
parent
cc0f8f3c28
commit
48c5ec9b24
@ -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
|
// 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';
|
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 ' : '').
|
$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 ";
|
$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
|
// mssql and others cant use DISTICT if text columns (info_des) are involved
|
||||||
|
Loading…
Reference in New Issue
Block a user