From 1d0fce3a80f25a4db3a7ab1d2aaa2a826060ff2a Mon Sep 17 00:00:00 2001
From: Edward <edward@roojs.com>
Date: Mon, 4 May 2015 16:50:15 +0800
Subject: [PATCH] DataObjects/Core_notify_recur.php

---
 DataObjects/Core_notify_recur.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/DataObjects/Core_notify_recur.php b/DataObjects/Core_notify_recur.php
index bc01c327..02246062 100644
--- a/DataObjects/Core_notify_recur.php
+++ b/DataObjects/Core_notify_recur.php
@@ -116,7 +116,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         foreach($usedays as $d){
             foreach($hours as $h){
                 $date = new DateTime($d. ' ' . $h, new DateTimeZone($this->tz));
-                $date->setTimezone(new DateTimeZone(date_default_timezone_get()));
+                $date->setTimezone(new DateTimeZone(ini_get('date.timezone')));
                 $ret[] = $date->format('Y-m-d H:i:s');
             }
         }
@@ -127,7 +127,6 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
     {
         //DB_DataObject::debugLevel(1);
         $w = DB_DataObject::factory($this->tableName());
-        $w->id = 117;
         $w->find();
         
         while($w->fetch()){
@@ -142,14 +141,14 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         
 
         $notifytimes = $this->notifyTimes(2);
-//        print_R($notifytimes);exit;
+        ////print_R($notifytimes);
         
         $newSearch = DB_DataObject::factory('core_notify');
         $newSearch->whereAdd( 'act_start > NOW()');
         $newSearch->recur_id = $this->id;
         $old = $newSearch->fetchAll('act_start', 'id');
         // returns array('2012-12-xx'=>12, 'date' => id....)
-        print_R($old);exit;
+
         
         
         foreach($notifytimes as $time){
@@ -166,14 +165,12 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
                 unset($old[$time]);
                 continue;
             }
-            print_R($time);exit;
             if (strtotime($time) < time()) {
                 // will not get deleted..
                 //echo "SKIP BEFORE NOW";
                 unset($old[$time]);
                continue;
             }
-            
             // do not have a notify event... creat it..
             $add = DB_DataObject::factory('core_notify');
             $add->setFrom(array(
-- 
2.39.2