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

fixed accounts only search, was returning the account more then once --> order of the joins were wrong

Browse Source
This commit is contained in:
Ralf Becker 2006-04-26 12:11:12 +00:00
parent 4c0a9c5f1b
commit cf2686e3ed
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,15 +158,15 @@ class socontacts_sql extends so_sql
else */ // simulate the outer join with a union else */ // simulate the outer join with a union
{ {
parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,'UNION',$filter, parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,'UNION',$filter,
'LEFT'.$this->accounts_join.' '.$join,$need_full_no_count); 'LEFT'.$this->accounts_join.$join,$need_full_no_count);
$filter[] = '(person_id=0 OR person_id IS NULL)'; // unfortunally both is used in eGW $filter[] = '(person_id=0 OR person_id IS NULL)'; // unfortunally both is used in eGW
parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,'UNION',$filter, parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,'UNION',$filter,
'RIGHT'.$this->accounts_join.' '.$join,$need_full_no_count); 'RIGHT'.$this->accounts_join.$join,$need_full_no_count);
} }
} }
elseif (!$owner) // search for accounts only elseif (!$owner) // search for accounts only
{ {
$join .= ' RIGHT'.$this->accounts_join; $join = ' RIGHT'.$this->accounts_join.$join;
$filter[] = "account_type='u'"; // no groups $filter[] = "account_type='u'"; // no groups
} }
return parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count); return parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);