mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-13 08:50:07 +01:00
fixed sql error if an addressbook get selected in the extended search
This commit is contained in:
parent
58c7f4bf61
commit
077f432d6c
@ -335,6 +335,11 @@ class socontacts_sql extends so_sql
|
|||||||
$filter[] = $this->table_name.'.contact_owner='.(int)$filter['owner'];
|
$filter[] = $this->table_name.'.contact_owner='.(int)$filter['owner'];
|
||||||
unset($filter['owner']);
|
unset($filter['owner']);
|
||||||
}
|
}
|
||||||
|
if (isset($criteria['owner']))
|
||||||
|
{
|
||||||
|
$criteria[] = $this->table_name.'.contact_owner='.(int)$criteria['owner'];
|
||||||
|
unset($criteria['owner']);
|
||||||
|
}
|
||||||
// postgres requires that expressions in order by appear in the columns of a distinct select
|
// postgres requires that expressions in order by appear in the columns of a distinct select
|
||||||
if ($this->db->Type != 'mysql' && preg_match("/(\w+<>'')/",$order_by,$matches))
|
if ($this->db->Type != 'mysql' && preg_match("/(\w+<>'')/",$order_by,$matches))
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user