Use Horde_Date in Horde_Alarm.

diff --git a/framework/Alarm/Alarm.php b/framework/Alarm/Alarm.php
index 75973e9..f01a947 100644 (file)
--- a/framework/Alarm/Alarm.php
+++ b/framework/Alarm/Alarm.php
@@ -235,10 +235,6 @@ class Horde_Alarm {
                 }
 
                 foreach ($alarms as $alarm) {
-                    $alarm['start'] = new Horde_Date($alarm['start']);
-                    if (!empty($alarm['end'])) {
-                        $alarm['end'] = new Horde_Date($alarm['end']);
-                    }
                     $this->set($alarm);
                 }
             }

diff --git a/kronolith/lib/Event.php b/kronolith/lib/Event.php
index 592d69a..76fbea3 100644 (file)
--- a/kronolith/lib/Event.php
+++ b/kronolith/lib/Event.php
@@ -1154,8 +1154,8 @@ abstract class Kronolith_Event
         return array(
             'id' => $this->uid,
             'user' => $user,
-            'start' => $start->timestamp(),
-            'end' => $this->end->timestamp(),
+            'start' => $start,
+            'end' => $this->end,
             'methods' => array_keys($methods),
             'params' => $methods,
             'title' => $this->getTitle($user),

diff --git a/nag/lib/Task.php b/nag/lib/Task.php
index fd067ca..f195e28 100644 (file)
--- a/nag/lib/Task.php
+++ b/nag/lib/Task.php
@@ -776,7 +776,7 @@ class Nag_Task {
         return array(
             'id' => $this->uid,
             'user' => $user,
-            'start' => $this->due - $this->alarm * 60,
+            'start' => new Horde_Date($this->due - $this->alarm * 60),
             'methods' => array_keys($methods),
             'params' => $methods,
             'title' => $this->name,