From: Alan Knowles <alan@roojs.com>
Date: Thu, 7 Jan 2016 07:47:01 +0000 (+0800)
Subject: DataObjects/Core_notify_recur.php
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=a10228b0478a4f93e13abdd8b5caaeeb6e3e2b48

DataObjects/Core_notify_recur.php
---

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);
     }