holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"if negating a search with an exclemation mark, we have to AND the criteria"

Browse Source
This commit is contained in:
Ralf Becker 2010-04-20 08:46:14 +00:00
parent cb9daa98ec
commit c2413db67b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpgwapi/inc/class.accounts_sql.inc.php
View File

@ -341,7 +341,7 @@ class accounts_sql
break;
default:
case 'both':
$filter = "(contact_owner=0 OR contact_owner IS NULL)";
$filter = "(egw_addressbook.contact_owner=0 OR egw_addressbook.contact_owner IS NULL)";
break;
}
$criteria = array();
@ -384,7 +384,7 @@ class accounts_sql
$accounts = array();
foreach((array) $GLOBALS['egw']->contacts->search($criteria,"1,n_given,n_family,email,id,created,modified,$this->table.account_id AS account_id",
$order,"account_lid,account_type,account_status",
$wildcard,false,'OR',$offset ? array($start,$offset) : is_null($start) ? false : $start,
$wildcard,false,$query[0] == '!' ? 'AND' : 'OR',$offset ? array($start,$offset) : is_null($start) ? false : $start,
$filter,$this->contacts_join) as $contact)
{
if ($contact)