Revert commit 13946

[gosa.git] / trunk / gosa-plugins / goto / addons / goto / events / class_DaemonEvent.inc

diff --git a/trunk/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc b/trunk/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc
index b163d1b0552aff03fe479d7fa38caf4b1677b736..575626165251341721be9b18f95388cc4bf8fef2 100644 (file)
--- a/trunk/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc
+++ b/trunk/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc
@@ -431,9 +431,11 @@ class DaemonEvent
     foreach($this->attributes as $attr){
       $ret[$attr] = $this->$attr;
     }
-
-    $ret['timestamp'] = $this->_timestamp_to_event($this->timestamp);
-
+    if($this->mode == SCHEDULED_EVENT){
+      $ret['timestamp'] = $this->_timestamp_to_event($this->timestamp);
+    }elseif(isset($ret['timestamp'])){
+      unset($ret['timestamp']);
+    }
     return($ret);
   }