X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_notify.php;h=dbf012bb5b2c3aa37b43af22c5e35ffea6d2847f;hp=0997d37e787c0b450cb04baaecb6a08ad53c902c;hb=HEAD;hpb=976d54e7b28d381b97cb49aed15365ae5db8d45b

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index 0997d37e..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,7 +352,7 @@ 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->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);