extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 00:13:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar/CalDAV/eSync: fixed recuring events were returned in sync, even if user rejected (after recent database schema changes)

Browse Source
This commit is contained in:
Ralf Becker 2012-10-02 12:56:17 +00:00
parent 0af9ed0cd9
commit fba3bda918
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/inc/class.calendar_so.inc.php
View File

@ -544,8 +544,8 @@ class calendar_so
" ON $this->cal_table.cal_id=rejected_by_user.cal_id". " ON $this->cal_table.cal_id=rejected_by_user.cal_id".
" AND rejected_by_user.cal_user_type='u'". " AND rejected_by_user.cal_user_type='u'".
" AND rejected_by_user.cal_user_id=".$this->db->quote($remove_rejected_by_user). " AND rejected_by_user.cal_user_id=".$this->db->quote($remove_rejected_by_user).
" AND (recur_type IS NULL AND rejected_by_user.cal_recur_date=0". " AND ".(!$params['enum_recuring'] ? 'rejected_by_user.cal_recur_date=0' :
($params['enum_recuring'] ? " OR cal_start=rejected_by_user.cal_recur_date" : '').')'; '(recur_type IS NULL AND rejected_by_user.cal_recur_date=0 OR cal_start=rejected_by_user.cal_recur_date)');
$or_required = array( $or_required = array(
'rejected_by_user.cal_status IS NULL', 'rejected_by_user.cal_status IS NULL',
"rejected_by_user.cal_status NOT IN ('R','X')", "rejected_by_user.cal_status NOT IN ('R','X')",