Merge branch 'MDL-67432-master_quizaccess_settings' of https://github.com/catalyst/moodle

This commit is contained in:
Jake Dallimore 2019-12-10 09:30:36 +08:00
commit 80c13fed94

View File

@ -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);
}