From e2c5d41a6bca359c8ef8aee14766c363d49da4fd Mon Sep 17 00:00:00 2001 From: Andrew Madden Date: Thu, 5 Dec 2019 16:24:48 +1100 Subject: [PATCH] MDL-67432 quiz: Load all quiz subplugin settings from quiz settings. Quiz quizaccess and report subplugins should have greater control over their own settings. Remove the condition that they are only included when in the full admin tree which doesn't include admin search page. The $ADMIN->fulltree condition should be handled by subplugin settings. --- mod/quiz/settings.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/mod/quiz/settings.php b/mod/quiz/settings.php index 16d21a6b1c8..fdaa197a4ac 100644 --- a/mod/quiz/settings.php +++ b/mod/quiz/settings.php @@ -234,9 +234,7 @@ if (empty($reportsbyname) && empty($rulesbyname)) { $settings = new admin_settingpage('modsettingsquizcat'.$reportname, $strreportname, 'moodle/site:config', $module->is_enabled() === false); - if ($ADMIN->fulltree) { - include($CFG->dirroot . "/mod/quiz/report/$reportname/settings.php"); - } + include($CFG->dirroot . "/mod/quiz/report/$reportname/settings.php"); if (!empty($settings)) { $ADMIN->add('modsettingsquizcat', $settings); } @@ -246,9 +244,7 @@ if (empty($reportsbyname) && empty($rulesbyname)) { foreach ($rulesbyname as $strrulename => $rule) { $settings = new admin_settingpage('modsettingsquizcat' . $rule, $strrulename, 'moodle/site:config', $module->is_enabled() === false); - if ($ADMIN->fulltree) { - include($CFG->dirroot . "/mod/quiz/accessrule/$rule/settings.php"); - } + include($CFG->dirroot . "/mod/quiz/accessrule/$rule/settings.php"); if (!empty($settings)) { $ADMIN->add('modsettingsquizcat', $settings); }