Merge branch '3.5.5' into 3.6

This commit is contained in:
Romain Neutron
2011-12-28 15:00:18 +01:00
14 changed files with 45 additions and 22 deletions

View File

@@ -108,11 +108,16 @@ class task_Scheduler
foreach ($task_manager->get_tasks() as $task)
{
if (!$task->is_active())
{
continue;
}
$tid = $task->get_task_id();
if (!$task->is_running())
{
/* @var $task task_abstract */
$task->reset_crash_counter();
$task->set_status(task_abstract::STATUS_TOSTART);
}
}