MDL-75308 task: explicit check for tasks of disabled plugins.

The enabled state of a plugin is a tri-state value (boolean or
null). We should be consistent with elsewhere by only considering
boolean false as an actually disabled plugin.

See also cdcb53a1 for similar change in task management.
This commit is contained in:
Paul Holden
2022-08-30 13:03:52 +01:00
parent cd11b40558
commit fc0bd43f9d
2 changed files with 3 additions and 4 deletions
+2 -3
View File
@@ -213,10 +213,9 @@ class tool_task_renderer extends plugin_renderer_base {
* @return string HTML.
*/
public function next_run_time(scheduled_task $task): string {
$plugininfo = core_plugin_manager::instance()->get_plugin_info($task->get_component());
$nextrun = $task->get_next_run_time();
if ($plugininfo && $plugininfo->is_enabled() === false && !$task->get_run_if_component_disabled()) {
if (!$task->is_component_enabled() && !$task->get_run_if_component_disabled()) {
$nextrun = get_string('plugindisabled', 'tool_task');
} else if ($task->get_disabled()) {
$nextrun = get_string('taskdisabled', 'tool_task');
+1 -1
View File
@@ -247,7 +247,7 @@ abstract class task_base {
return true;
} else {
$plugininfo = core_plugin_manager::instance()->get_plugin_info($component);
return $plugininfo && $plugininfo->is_enabled();
return $plugininfo && ($plugininfo->is_enabled() !== false);
}
}
}