Merge branch 'MDL-72734-311' of https://github.com/paulholden/moodle …

…into MOODLE_311_STABLE

admin/tool/task/schedule_task.php

@@ -47,15 +47,17 @@ function tool_task_mtrace_wrapper($message, $eol) {
 require_admin();
 $context = context_system::instance();
 
-if (!get_config('tool_task', 'enablerunnow')) {
-    print_error('nopermissions', 'error', '', get_string('runnow', 'tool_task'));
-}
-
 // Check input parameter against all existing tasks (this ensures it isn't possible to
 // create some kind of security problem by specifying a class that isn't a task or whatever).
 $task = \core\task\manager::get_scheduled_task($taskname);
 if (!$task) {
-    print_error('cannotfindinfo', 'error', $taskname);
+    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()) {
+    throw new moodle_exception('nopermissions', 'error', new moodle_url('/admin/tool/task/scheduledtasks.php'),
+        get_string('runnow', 'tool_task'), $task->get_name());
 }
 
 // Start output.