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

fix sql error, if contact_bday is not aliases as bday (works too if it is alias)

Browse Source
This commit is contained in:
Ralf Becker 2013-07-23 15:03:41 +00:00
parent 6e6b2b7b0a
commit a46b5b3255
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_bo.inc.php
View File

@ -1723,7 +1723,7 @@ class calendar_bo
$extra_accounts_search = $contacts->account_repository == 'ldap' && !is_null($contacts->so_accounts) && $extra_accounts_search = $contacts->account_repository == 'ldap' && !is_null($contacts->so_accounts) &&
!$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']; !$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'];
if ($extra_accounts_search && ($bdays2 =& $contacts->search('',array('id','n_family','n_given','n_prefix','n_middle','bday'), if ($extra_accounts_search && ($bdays2 =& $contacts->search('',array('id','n_family','n_given','n_prefix','n_middle','bday'),
'bday ASC',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter+array('owner' => 0)))) 'contact_bday ASC',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter+array('owner' => 0))))
{ {
$bdays = !$bdays ? $bdays2 : array_merge($bdays,$bdays2); $bdays = !$bdays ? $bdays2 : array_merge($bdays,$bdays2);
} }