Update alarm after moving the task to a different list.

diff --git a/nag/lib/Driver.php b/nag/lib/Driver.php
index 723184d..dd4c97c 100644 (file)
--- a/nag/lib/Driver.php
+++ b/nag/lib/Driver.php
@@ -300,21 +300,6 @@ class Nag_Driver
             return $modify;
         }
 
-        /* Update alarm if necessary. */
-        if (!empty($GLOBALS['conf']['alarms']['driver'])) {
-            $horde_alarm = Horde_Alarm::factory();
-            if (empty($alarm) || $completed) {
-                $horde_alarm->delete($task->uid);
-            } else {
-                $task = $this->get($taskId);
-                $alarm = $task->toAlarm();
-                if ($alarm) {
-                    $alarm['start'] = new Horde_Date($alarm['start']);
-                    $horde_alarm->set($alarm);
-                }
-            }
-        }
-
         $new_task = $this->get($task->id);
         $log_tasklist = $this->_tasklist;
         if (!is_null($tasklist) && $task->tasklist != $tasklist) {
@@ -354,6 +339,21 @@ class Nag_Driver
             }
         }
 
+        /* Update alarm if necessary. */
+        if (!empty($GLOBALS['conf']['alarms']['driver'])) {
+            $horde_alarm = Horde_Alarm::factory();
+            if (empty($alarm) || $completed) {
+                $horde_alarm->delete($task->uid);
+            } else {
+                $task = $this->get($taskId);
+                $alarm = $task->toAlarm();
+                if ($alarm) {
+                    $alarm['start'] = new Horde_Date($alarm['start']);
+                    $horde_alarm->set($alarm);
+                }
+            }
+        }
+
         /* Log the modification of this item in the history log. */
         if (!empty($task->uid)) {
             $history = Horde_History::singleton();