MDL-17272 merged from MOODLE_19_STABLE

diff --git a/admin/settings/grades.php b/admin/settings/grades.php
index 50862f3b8e55131c54e641579da6fb1dc4ae2c9b..910104cdafbd6be578f5d2d2c70f07f8426cb9a0 100644 (file)
--- a/admin/settings/grades.php
+++ b/admin/settings/grades.php
@@ -150,8 +150,10 @@ if (has_capability('moodle/grade:manage', $systemcontext)
 
     $scales = new admin_externalpage('scales', get_string('scales'), $CFG->wwwroot.'/grade/edit/scale/index.php', 'moodle/grade:manage');
     $ADMIN->add('grades', $scales);
-    $outcomes = new admin_externalpage('outcomes', get_string('outcomes', 'grades'), $CFG->wwwroot.'/grade/edit/outcome/index.php', 'moodle/grade:manage', empty($CFG->enableoutcomes));
-    $ADMIN->add('grades', $outcomes);
+    if ($CFG->enableoutcomes) {
+        $outcomes = new admin_externalpage('outcomes', get_string('outcomes', 'grades'), $CFG->wwwroot.'/grade/edit/outcome/index.php', 'moodle/grade:manage', empty($CFG->enableoutcomes));
+        $ADMIN->add('grades', $outcomes);
+    }
     $letters = new admin_externalpage('letters', get_string('letters', 'grades'), $CFG->wwwroot.'/grade/edit/letter/edit.php', 'moodle/grade:manageletters');
     $ADMIN->add('grades', $letters);
 

diff --git a/grade/edit/outcome/index.php b/grade/edit/outcome/index.php
index 510cad49c110b7d80d5813dfafc25d6ceedad3bc..f6a7a9bb427b575f0f6e67ecc26000b5317c5442 100644 (file)
--- a/grade/edit/outcome/index.php
+++ b/grade/edit/outcome/index.php
@@ -46,6 +46,9 @@ if ($courseid) {
     }
 
 } else {
+    if (empty($CFG->enableoutcomes)) {
+        redirect('../../../');
+    }
     require_once $CFG->libdir.'/adminlib.php';
     admin_externalpage_setup('outcomes');
 }