MDL-18238 Merged from MOODLE_19_STABLE

diff --git a/grade/edit/settings/form.php b/grade/edit/settings/form.php
index fecaa9ed5e5ca2508595b6fd356c279b53ecd734..4a6714f33edeb327d57af8159f1b4cc719c0364b 100644 (file)
--- a/grade/edit/settings/form.php
+++ b/grade/edit/settings/form.php
@@ -32,11 +32,13 @@ require_once($CFG->libdir.'/formslib.php');
 class course_settings_form extends moodleform {
 
     function definition() {
-        global $USER, $CFG;
+        global $USER, $CFG, $COURSE;
 
         $mform =& $this->_form;
 
         $systemcontext = get_context_instance(CONTEXT_SYSTEM);
+        $context = get_context_instance(CONTEXT_COURSE, $COURSE->id);
+
         $can_view_admin_links = false;
         if (has_capability('moodle/grade:manage', $systemcontext)) {
             $can_view_admin_links = true;
@@ -102,7 +104,7 @@ class course_settings_form extends moodleform {
         foreach($types as $type) {
             foreach (get_list_of_plugins('grade/'.$type) as $plugin) {
              // Include all the settings commands for this plugin if there are any
-                if (file_exists($CFG->dirroot.'/grade/'.$type.'/'.$plugin.'/lib.php')) {
+                if (file_exists($CFG->dirroot.'/grade/'.$type.'/'.$plugin.'/lib.php') && has_capability('gradereport/'.$plugin.':view', $context)) {
                     require_once($CFG->dirroot.'/grade/'.$type.'/'.$plugin.'/lib.php');
                     $functionname = 'grade_'.$type.'_'.$plugin.'_settings_definition';
                     if (function_exists($functionname)) {