MDL-19583 Showing outcomes in user report if enabled at site level. Merged from MOODL...

diff --git a/grade/report/user/lib.php b/grade/report/user/lib.php
index 19d1d02da892ab38d5a33f7a3796df349a2ee220..e5d60a8b0712107624e079985b3ea1e460af6132 100644 (file)
--- a/grade/report/user/lib.php
+++ b/grade/report/user/lib.php
@@ -107,7 +107,7 @@ class grade_report_user extends grade_report {
         $this->switch = grade_get_setting($this->courseid, 'aggregationposition', $CFG->grade_aggregationposition);
 
         // Grab the grade_tree for this course
-        $this->gtree = new grade_tree($this->courseid, false, $this->switch, false, true);
+        $this->gtree = new grade_tree($this->courseid, false, $this->switch, false, !$CFG->enableoutcomes);
 
         // Determine the number of rows and indentation
         $this->maxdepth = 1;