extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 07:09:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

"fix for bug #838: Distributionlist as mail addres: XML Response from server invalid"

Browse Source
This commit is contained in:
Ralf Becker 2007-06-03 09:49:10 +00:00
parent ad013af084
commit 6d04243cd6
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -290,7 +290,14 @@ class socontacts_sql extends so_sql
if ($search_customfields) // search the custom-fields if ($search_customfields) // search the custom-fields
{ {
$join .= $this->extra_join; $join .= $this->extra_join;
}
if (isset($filter['list']))
{
$join .= " JOIN $this->ab2list_table ON $this->table_name.contact_id=$this->ab2list_table.contact_id AND list_id=".(int)$filter['list'];
unset($filter['list']);
}
if ($join)
{
switch(gettype($only_keys)) switch(gettype($only_keys))
{ {
case 'boolean': case 'boolean':
@ -322,11 +329,6 @@ class socontacts_sql extends so_sql
unset($filter['owner']); unset($filter['owner']);
} }
} }
if (isset($filter['list']))
{
$join .= " JOIN $this->ab2list_table ON $this->table_name.contact_id=$this->ab2list_table.contact_id AND list_id=".(int)$filter['list'];
unset($filter['list']);
}
$rows =& parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count); $rows =& parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
if ($start === false) $this->total = is_array($rows) ? count($rows) : 0; // so_sql sets total only for $start !== false! if ($start === false) $this->total = is_array($rows) ? count($rows) : 0; // so_sql sets total only for $start !== false!