L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-74141-master' of https://github.com/sarjona/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2022-03-15 23:38:14 +01:00
parent 984669aeb2 730bc8735e
commit 337e740568
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/task/schedule_task.php
+6 -2
View File
@@ -54,8 +54,12 @@ if (!$task) {
throw new moodle_exception('cannotfindinfo', 'error', new moodle_url('/admin/tool/task/scheduledtasks.php'), $taskname);
}
$canruntasks = \core\task\manager::is_runnable() && get_config('tool_task', 'enablerunnow');
if (!$canruntasks || !$task->can_run()) {
if (!\core\task\manager::is_runnable()) {
$redirecturl = new \moodle_url('/admin/settings.php', ['section' => 'systempaths']);
throw new moodle_exception('cannotfindthepathtothecli', 'tool_task', $redirecturl->out());
}
if (!get_config('tool_task', 'enablerunnow') || !$task->can_run()) {
throw new moodle_exception('nopermissions', 'error', new moodle_url('/admin/tool/task/scheduledtasks.php'),
get_string('runnow', 'tool_task'), $task->get_name());
}
lib/classes/task/manager.php
+1 -1
View File
@@ -1116,7 +1116,7 @@ class manager {
if (!self::is_runnable()) {
$redirecturl = new \moodle_url('/admin/settings.php', ['section' => 'systempaths']);
throw new \moodle_exception('cannotfindthepathtothecli', 'core_task', $redirecturl->out());
throw new \moodle_exception('cannotfindthepathtothecli', 'tool_task', $redirecturl->out());
} else {
// Shell-escaped path to the PHP binary.
$phpbinary = escapeshellarg(self::find_php_cli_path());