From 3fc090ba3375dd300daa622024620e6e8da6f1ba Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 23 Jul 2013 15:03:12 +0000 Subject: [PATCH] fix sql error, if contact_bday is not aliases as bday (works too if it is alias) --- calendar/inc/class.calendar_bo.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php index 10520fd8b1..69fdf35202 100644 --- a/calendar/inc/class.calendar_bo.inc.php +++ b/calendar/inc/class.calendar_bo.inc.php @@ -1723,7 +1723,7 @@ class calendar_bo $extra_accounts_search = $contacts->account_repository == 'ldap' && !is_null($contacts->so_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'), - '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); }