Backport from FW_51.

Bug: 12928
horde · Mar 6, 2014 · b7f60d4 · b7f60d4
1 parent 4415eab
commit b7f60d4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/kronolith/lib/Event.php b/kronolith/lib/Event.php
@@ -2002,7 +2002,7 @@ public function fromHash($hash)
      */
     public function toAlarm($time, $user = null, $prefs = null)
     {
-        if (!$this->alarm) {
+        if (!$this->alarm || $this->status == Kronolith::STATUS_CANCELLED) {
             return;
         }