mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-15 04:24:41 +01:00
Backport 31413 - Avoid conflicts with other objects that have ->db defined by using the global db
This commit is contained in:
parent
646a0a4ca4
commit
b82cdbcdd7
@ -1094,7 +1094,7 @@ class so_sql
|
||||
}
|
||||
if($columns)
|
||||
{
|
||||
$columns = call_user_func_array(array($this->db,'concat'),$columns);
|
||||
$columns = call_user_func_array(array($GLOBALS['egw']->db,'concat'),$columns);
|
||||
}
|
||||
|
||||
// Break the search string into tokens
|
||||
|
Loading…
Reference in New Issue
Block a user