From: psc <psc@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 22 Jul 2009 11:29:01 +0000 (+0000)
Subject: Revert commit 13946
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d7d131db42bf75379269d06a799a116aa84f626e;p=gosa.git

Revert commit 13946

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@13947 594d385d-05f5-0310-b6e9-bd551577e9d8
---

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 b163d1b05..575626165 100644
--- 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);
   }
 
diff --git a/trunk/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_notify.inc b/trunk/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_notify.inc
index e2599414b..13bf90dd8 100644
--- a/trunk/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_notify.inc
+++ b/trunk/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_notify.inc
@@ -31,7 +31,7 @@ class DaemonEvent_notify extends DaemonEvent
   var $subject = "";
   var $from    = "";
 
-  var $attributes = array("from","user","group","message","subject","timestamp");
+  var $attributes = array("from","user","group","message","subject");
 
   public function __construct($config,$data = array())
   {