From 8eac1846d1e58c617e08f6a8f5e7aa93c278ba4d Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Tue, 2 Mar 2010 22:18:56 +0100 Subject: [PATCH] Update alarm after moving the task to a different list. --- nag/lib/Driver.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/nag/lib/Driver.php b/nag/lib/Driver.php index 723184d9e..dd4c97cb1 100644 --- 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(); -- 2.11.0