X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_notify.php;h=6cc632ab553d517b8366eb262da5abcb37b4b76b;hp=09986327933d93d58df064699ba065f6c00680d2;hb=HEAD;hpb=c7b4d24e21e30a6f9a23c42de500991b0df59f75

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index 09986327..2570c860 100644
--- a/DataObjects/Core_notify.php
+++ b/DataObjects/Core_notify.php
@@ -279,6 +279,7 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
                     break;
                 case 'PENDING';
                     $this->whereAdd('event_id = 0 OR (event_id  > 0 AND act_when > NOW() )');
+                    $this->whereAdd("sent < '2000-01-01'");
                     break;
                 
                 case 'OPENED';
@@ -351,8 +352,8 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         if(strtotime($this->act_when) > strtotime("NOW")){
             $this->act_when = $this->sqlValue('NOW()');
         }
-        $this->sent = $this->sent == '0000-00-00 00:00:00' ? $this->sqlValue('NOW()') :$this->sent; // do not update if sent.....
-        $this->msgid = '';
+        $this->sent = empty($this->sent) || strtotime($this->sent) < 1 ? $this->sqlValue('NOW()') :$this->sent; // do not update if sent.....
+        $this->msgid = $msgid;
         $this->event_id = $event->id;
         $this->update($ww);
     }