diff --git a/kronolith/docs/CHANGES b/kronolith/docs/CHANGES
index 6f84523c090..87b3d339575 100644
--- a/kronolith/docs/CHANGES
+++ b/kronolith/docs/CHANGES
@@ -2,6 +2,8 @@
v4.1.5-git
----------
+[jan] Ignore iCalendar alarms without action, and use first, not last alarm
+ (Bug #12865).
[mjr] Fix incorrect case comparison when synchronizing tags with Kolab (Bug
#12770).
[mjr] Honor recurrence-id range values when deleting recurring events (Bug
diff --git a/kronolith/lib/Event.php b/kronolith/lib/Event.php
index e9e3a795d33..7ef4d20dfb8 100644
--- a/kronolith/lib/Event.php
+++ b/kronolith/lib/Event.php
@@ -1187,6 +1187,12 @@ public function fromiCalendar($vEvent)
if (!($alarm instanceof Horde_Icalendar_Valarm)) {
continue;
}
+ try {
+ if ($alarm->getAttribute('ACTION') == 'NONE') {
+ continue;
+ }
+ } catch (Horde_Icalendar_Exception $e) {
+ }
try {
// @todo consider implementing different ACTION types.
// $action = $alarm->getAttribute('ACTION');
@@ -1220,6 +1226,7 @@ public function fromiCalendar($vEvent)
if (!$haveTrigger) {
$this->alarm = -intval($trigger / 60);
}
+ break;
}
// Alarm snoozing/dismissal
diff --git a/kronolith/package.xml b/kronolith/package.xml
index 791c888dd12..cdfb767e9c1 100644
--- a/kronolith/package.xml
+++ b/kronolith/package.xml
@@ -33,6 +33,7 @@
GPL-2.0
+* [jan] Ignore iCalendar alarms without action, and use first, not last alarm (Bug #12865).
* [mjr] Fix incorrect case comparison when synchronizing tags with Kolab (Bug #12770).
* [mjr] Honor recurrence-id range values when deleting recurring events (Bug #12746).
* [mjr] Fix deleting and sending iTip notifications for recurring events (Bug: 12746).
@@ -2243,6 +2244,7 @@
2013-10-29
GPL-2.0
+* [jan] Ignore iCalendar alarms without action, and use first, not last alarm (Bug #12865).
* [mjr] Fix incorrect case comparison when synchronizing tags with Kolab (Bug #12770).
* [mjr] Honor recurrence-id range values when deleting recurring events (Bug #12746).
* [mjr] Fix deleting and sending iTip notifications for recurring events (Bug: 12746).