Merge branch 'wip-MDL-38300-m25' of git://github.com/samhemelryk/moodle

moodle · Mar 5, 2013 · 2b48123 · 2b48123
2 parents caa5bce + cf73861
commit 2b48123
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/navigationlib.php b/lib/navigationlib.php
@@ -3976,14 +3976,14 @@ protected function generate_user_settings($courseid, $userid, $gstitle='usercurr
             $reportfunction($reporttab, $user, $course);
         }
         $anyreport = has_capability('moodle/user:viewuseractivitiesreport', $usercontext);
-        if ($anyreport || ($course->showreports && $iscurrentuser && $forceforcontext)) {
+        if ($anyreport || ($course->showreports && $currentuser && $forceforcontext)) {
             // Add grade hardcoded grade report if necessary.
             $gradeaccess = false;
             if (has_capability('moodle/grade:viewall', $coursecontext)) {
                 // Can view all course grades.
                 $gradeaccess = true;
             } else if ($course->showgrades) {
-                if ($iscurrentuser && has_capability('moodle/grade:view', $coursecontext)) {
+                if ($currentuser && has_capability('moodle/grade:view', $coursecontext)) {
                     // Can view own grades.
                     $gradeaccess = true;
                 } else if (has_capability('moodle/grade:viewall', $usercontext)) {