From cd70bec9faf8f29159eafb3ae1e63ab9d7a76919 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Wed, 17 Dec 2014 13:57:49 -0500 Subject: [PATCH] Fix for bug #3008 --- NEWS | 1 + SoObjects/Appointments/SOGoAppointmentFolder.m | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index b9c6b6cd1..4856bb7aa 100644 --- a/NEWS +++ b/NEWS @@ -14,6 +14,7 @@ Bug fixes - fix for privacy and categories for EAS (#3022) - correctly set MeetingStatus for EAS on iOS devices - Ubuntu Lucid fixes for EAS + - fix calendar reminders for future events (#3008) 2.2.11a (2014-12-10) -------------------- diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index 75d02ea5b..a01c10c62 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -2831,8 +2831,8 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir return nil; } - sql = [NSString stringWithFormat: @"((c_nextalarm <= %u) AND (c_nextalarm >= %u)) OR ((c_nextalarm > 0) AND (c_enddate > %u))", - [_endUTCDate unsignedIntValue], [_startUTCDate unsignedIntValue], [_startUTCDate unsignedIntValue]]; + sql = [NSString stringWithFormat: @"((c_nextalarm <= %u) AND (c_nextalarm >= %u)) OR ((c_nextalarm > 0) AND (c_nextalarm <= %u) AND (c_enddate > %u))", + [_endUTCDate unsignedIntValue], [_startUTCDate unsignedIntValue], [_startUTCDate unsignedIntValue], [_startUTCDate unsignedIntValue]]; qualifier = [EOQualifier qualifierWithQualifierFormat: sql]; records = [folder fetchFields: nameFields matchingQualifier: qualifier];