DataObjects/Core_notify_recur.php

[Pman.Core] / DataObjects / Core_notify_recur.php

diff --git a/DataObjects/Core_notify_recur.php b/DataObjects/Core_notify_recur.php
index e495ce7..3c871dd 100644 (file)
--- a/DataObjects/Core_notify_recur.php
+++ b/DataObjects/Core_notify_recur.php
@@ -64,7 +64,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
     function notifytimesRange($advance) {
         
         $start = date('Y-m-d H:i:s', max(strtotime("NOW"), strtotime($this->dtstart)));
-        $end  = date('Y-m-d H:i:s', min(strtotime("NOW + $advance DAYS"), strtotime($this->dtend)));
+        $end  = min( new DateTime("NOW + $advance DAYS"),  new DateTime($this->dtend ) )->format('Y-m-d H:i:s');
         
         return array($start, $end);
     }
@@ -84,6 +84,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         
         list($start, $end) = $this->notifytimesRange($advance);
         var_dump(array($start, $end));
+        print_r($this);
         
         if (strtotime($start) > strtotime($end)) {
             return array(); // no data..