From 479b534857de63709c1ffd6f17433d9b35f680d5 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Fri, 30 Dec 2016 10:31:29 -0500 Subject: [PATCH] (fix) properly save email alarms in the db (fixes #3949) --- NEWS | 1 + SoObjects/Appointments/iCalEntityObject+SOGo.m | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 3dc19b99b..bb721d667 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,7 @@ Bug fixes - [core] use source's domain when none defined and trying to match users (#3523) - [core] handle delegation with no SENT-BY set (#3368) - [core] properly honor the "include in freebusy" setting (#3354) + - [core] properly save next email alarm in the database (#3949) - [web] fixed confusion between owner and active user in ACLs management of Administration module - [web] fixed JavaScript exception after renaming an address book - [web] fixed Sieve folder encoding support (#3904) diff --git a/SoObjects/Appointments/iCalEntityObject+SOGo.m b/SoObjects/Appointments/iCalEntityObject+SOGo.m index f7ee0a4f8..b42d41592 100644 --- a/SoObjects/Appointments/iCalEntityObject+SOGo.m +++ b/SoObjects/Appointments/iCalEntityObject+SOGo.m @@ -861,7 +861,7 @@ NSNumber *iCalDistantFutureNumber = nil; [row setObject: [NSNumber numberWithInt: 0] forKey: @"c_nextalarm"]; // Delete old email alarms - if (alarm_number >= 0) + if (!nextAlarmDate && alarm_number >= 0) [af deleteRecordForEntryWithCName: nameInContainer inCalendarAtPath: [theContainer ocsPath]]; }