(fix) properly save email alarms in the db (fixes #3949)

Alinto · Dec 30, 2016 · 479b534 · 479b534
1 parent f6bcf26
commit 479b534
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -861,7 +861,7 @@ - (void) updateNextAlarmDateInRow: (NSMutableDictionary *) row
       [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]];
     }