From e75324a53e57202b256b58b1f771ba7f632eebd3 Mon Sep 17 00:00:00 2001 From: Marina Glancy Date: Fri, 9 Nov 2012 12:30:32 +0800 Subject: [PATCH] MDL-36369 Question types and behaviour settings should not require moodle/site:config --- admin/settings/plugins.php | 4 ++++ lib/adminlib.php | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/admin/settings/plugins.php b/admin/settings/plugins.php index 4d9365c51918c..b7fa57e8884db 100644 --- a/admin/settings/plugins.php +++ b/admin/settings/plugins.php @@ -312,6 +312,10 @@ // Question type settings if ($hassiteconfig || has_capability('moodle/question:config', $systemcontext)) { + if (!$hassiteconfig) { + require_once("$CFG->libdir/pluginlib.php"); + $allplugins = plugin_manager::instance()->get_plugins(); + } // Question behaviour settings. $ADMIN->add('modules', new admin_category('qbehavioursettings', new lang_string('questionbehaviours', 'admin'))); $ADMIN->add('qbehavioursettings', new admin_page_manageqbehaviours()); diff --git a/lib/adminlib.php b/lib/adminlib.php index 9ed45e1128e7f..0da5fe1a5acec 100644 --- a/lib/adminlib.php +++ b/lib/adminlib.php @@ -5252,7 +5252,7 @@ class admin_page_manageqbehaviours extends admin_externalpage { public function __construct() { global $CFG; parent::__construct('manageqbehaviours', get_string('manageqbehaviours', 'admin'), - new moodle_url('/admin/qbehaviours.php')); + new moodle_url('/admin/qbehaviours.php'), 'moodle/question:config'); } /** @@ -5299,7 +5299,8 @@ class admin_page_manageqtypes extends admin_externalpage { */ public function __construct() { global $CFG; - parent::__construct('manageqtypes', get_string('manageqtypes', 'admin'), "$CFG->wwwroot/$CFG->admin/qtypes.php"); + parent::__construct('manageqtypes', get_string('manageqtypes', 'admin'), "$CFG->wwwroot/$CFG->admin/qtypes.php", + 'moodle/question:config'); } /**