extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-11 00:18:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed sql error if an addressbook get selected in the extended search

Browse Source
This commit is contained in:
Ralf Becker 2007-07-12 09:57:35 +00:00
parent 2699258f07
commit d8b290f177
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addressbook/inc/class.socontacts_sql.inc.php
View File

@ -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))
{ {