MDL-36369 Question types and behaviour settings should not require mo…

…odle/site:config
moodle · Nov 13, 2012 · e75324a · e75324a
1 parent 5c4685f
commit e75324a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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');
     }
 
     /**