mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 13:02:07 +02:00
Code Issues Projects Releases Wiki Activity

MDL-73207 cron: Fixed cronspec field order bug

Browse Source
This commit is contained in:
Brendan Heywood 2021-11-30 12:52:46 +11:00
parent 51149a78cc
commit a113af2446
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config-dist.php
View File

@ -1129,7 +1129,7 @@ $CFG->admin = 'admin';
// ],
// ];
//
// The format for the schedule definition is: '{minute} {hour} {day} {dayofweek} {month}'.
// The format for the schedule definition is: '{minute} {hour} {day} {month} {dayofweek}'.
//
// The classname of the task also supports wildcards:
//

5
lib/classes/task/manager.php
View File

@ -1174,8 +1174,9 @@ class manager {
$overriddenrecord->minute,
$overriddenrecord->hour,
$overriddenrecord->day,
$overriddenrecord->dayofweek,
$overriddenrecord->month) = explode(' ', $taskconfig['schedule']);
$overriddenrecord->month,
$overriddenrecord->dayofweek
) = explode(' ', $taskconfig['schedule']);
}
}

26
lib/tests/scheduled_task_test.php
View File

@ -177,9 +177,9 @@ class core_scheduled_task_testcase extends advanced_testcase {
$task = reset($tasks);
$task->set_minute('1');
$task->set_hour('2');
$task->set_month('3');
$task->set_day_of_week('4');
$task->set_day('5');
$task->set_day('3');
$task->set_month('4');
$task->set_day_of_week('5');
$task->set_customised('1');
\core\task\manager::configure_scheduled_task($task);
@ -230,9 +230,9 @@ class core_scheduled_task_testcase extends advanced_testcase {
// Edit a task to simulate a change in its definition (as if it was not customised).
$task->set_minute('1');
$task->set_hour('2');
$task->set_month('3');
$task->set_day_of_week('4');
$task->set_day('5');
$task->set_day('3');
$task->set_month('4');
$task->set_day_of_week('5');
\core\task\manager::configure_scheduled_task($task);
// Fetch the task out for comparison.
@ -562,16 +562,16 @@ class core_scheduled_task_testcase extends advanced_testcase {
'min' => '10',
'hour' => '13',
'day' => '1',
'week' => '2',
'month' => '4',
'month' => '2',
'week' => '4',
'disabled' => 0,
),
'\core\task\scheduled_test2_task' => array(
'min' => '*',
'hour' => '*',
'day' => '*',
'week' => '*',
'month' => '*',
'week' => '*',
'disabled' => 1,
),
)
@ -592,16 +592,16 @@ class core_scheduled_task_testcase extends advanced_testcase {
'min' => '1',
'hour' => '2',
'day' => '3',
'week' => '4',
'month' => '5',
'month' => '4',
'week' => '5',
'disabled' => 0,
),
'\core\task\scheduled_test2_task' => array(
'min' => '1',
'hour' => '2',
'day' => '3',
'week' => '4',
'month' => '5',
'month' => '4',
'week' => '5',
'disabled' => 0,
),
)