From: nicolasconnault <nicolasconnault>
Date: Fri, 3 Apr 2009 08:14:01 +0000 (+0000)
Subject: MDL-17272 merged from MOODLE_19_STABLE
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=da2f44111aadff25a69d870522887a848e75c673;p=moodle.git

MDL-17272 merged from MOODLE_19_STABLE
---

diff --git a/admin/settings/grades.php b/admin/settings/grades.php
index 50862f3b8e..910104cdaf 100644
--- 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 510cad49c1..f6a7a9bb42 100644
--- 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');
 }