Index: branches/5.3.x/core/kernel/managers/scheduled_task_manager.php =================================================================== diff -u -N -r15698 -r15928 --- branches/5.3.x/core/kernel/managers/scheduled_task_manager.php (.../scheduled_task_manager.php) (revision 15698) +++ branches/5.3.x/core/kernel/managers/scheduled_task_manager.php (.../scheduled_task_manager.php) (revision 15928) @@ -1,6 +1,6 @@ 0 AND ' . adodb_mktime() . ' - LastRunOn > Timeout'; + $timeout_clause = 'LastRunStatus = ' . ScheduledTask::LAST_RUN_RUNNING . ' AND Timeout > 0 AND ' . time() . ' - LastRunOn > Timeout'; $sql = 'SELECT * FROM ' . $this->Application->getUnitConfig('scheduled-task')->getTableName() . ' @@ -135,12 +135,12 @@ // remember LastTimeoutOn only for events that are still running and will be reset if ( $event_data['LastRunStatus'] == ScheduledTask::LAST_RUN_RUNNING ) { - $this->update($event_data, Array ('LastTimeoutOn' => adodb_mktime())); + $this->update($event_data, Array ('LastTimeoutOn' => time())); } $next_run = (int)$event_data['NextRunOn']; - if ($next_run && ($next_run > adodb_mktime())) { + if ($next_run && ($next_run > time())) { continue; } @@ -169,7 +169,7 @@ $cron_helper = $this->Application->recallObject('kCronHelper'); /* @var $cron_helper kCronHelper */ - $start_time = adodb_mktime(); + $start_time = time(); // remember, when scheduled task execution started $fields_hash = Array ( @@ -189,7 +189,7 @@ $event->MasterEvent = new kEvent('scheduled-task:OnRun'); $this->Application->HandleEvent($event); - $now = adodb_mktime(); + $now = time(); $next_run = $cron_helper->getMatch($scheduled_task_data['RunSchedule'], $start_time); while ($next_run < $now) {