extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-04 20:40:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed not working listing of groups, after r29189

Browse Source
This commit is contained in:
Ralf Becker 2010-02-13 06:45:24 +00:00
parent 7d1ac84b67
commit ba5bdb79a2
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addressbook/inc/class.addressbook_so.inc.php
View File

@ -605,10 +605,18 @@ class addressbook_so
} }
// Hide deleted items unless type is specifically deleted // Hide deleted items unless type is specifically deleted
if(!is_array($filter)) $filter = array(); if(!is_array($filter)) $filter = $filter ? (array) $filter : array();
if($filter['tid'] !== self::DELETED_TYPE) { if($filter['tid'] !== self::DELETED_TYPE)
{
if ($join && strpos($join,'RIGHT JOIN') !== false) // used eg. to search for groups
{
$filter[] = '(contact_tid != \'' . self::DELETED_TYPE . '\' OR contact_tid IS NULL)';
}
else
{
$filter[] = 'contact_tid != \'' . self::DELETED_TYPE . '\''; $filter[] = 'contact_tid != \'' . self::DELETED_TYPE . '\'';
} }
}
$backend =& $this->get_backend(null,$filter['owner']); $backend =& $this->get_backend(null,$filter['owner']);
// single string to search for --> create so_sql conformant search criterial for the standard search columns // single string to search for --> create so_sql conformant search criterial for the standard search columns