X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_notify_recur.php;fp=DataObjects%2FCore_notify_recur.php;h=3c871ddfc716ef593d4e02b94b5c21072f38f4cf;hp=d5605eb43e138d9864dd0e90f22d74b4d789f639;hb=a10228b0478a4f93e13abdd8b5caaeeb6e3e2b48;hpb=0554967488adb5d01c536c6697efd65eab049a58 diff --git a/DataObjects/Core_notify_recur.php b/DataObjects/Core_notify_recur.php index d5605eb4..3c871ddf 100644 --- 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); }