extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues 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:09:37 +00:00
parent a46b5b3255
commit 217ecc01e0
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

@ -1718,7 +1718,7 @@ class calendar_bo
'bday' => "!''", 'bday' => "!''",
); );
$bdays =& $contacts->search('',array('id','n_family','n_given','n_prefix','n_middle','bday'), $bdays =& $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); 'contact_bday ASC',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter);
// search accounts too, if not stored in contacts repository // search accounts too, if not stored in contacts repository
$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'];