FIxes for bug 2379 (merged from stable)

diff --git a/course/recent.php b/course/recent.php
index f8c8020bbe0e73dbeb0c1f532f44627aea59dc98..2e7e54d8773e0e5982629fba0e65afe11a4f0177 100644 (file)
--- a/course/recent.php
+++ b/course/recent.php
@@ -110,7 +110,7 @@
 
     } else { // you chose a group of activities
 
-        if (isteacher($user)) {
+        if (isteacher($course->id)) {
             $hiddenfilter = "";
         } else {
             $hiddenfilter = " AND cs.visible = '1' ";
@@ -135,7 +135,7 @@
             $activityfilter = "";
         }
 
-        if (isteacher($user)) {
+        if (isteacher($course->id)) {
             $hiddenfilter = "";
         } else {
             $hiddenfilter = " AND cm.visible = '1' ";
@@ -231,7 +231,7 @@
 
         $section = 0;
 
-        if (isteacher($user)) {
+        if (isteacher($course->id)) {
             $teacher = true;
         } else {
             $teacher = false;

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 911778372e9b5c4a7ceaa6c38a83630c7f21ceff..eed158eddc86e21eef94260a4d399f55dabfc994 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -767,7 +767,7 @@ function assignment_print_recent_mod_activity($activity, $course, $detail=false)
 
     }
 
-    if (isteacher($USER)) {
+    if (isteacher($course)) {
         $grades = "(" .  $activity->content->grade . " / " . $activity->content->maxgrade . ") ";
 
         $assignment->id = $activity->instance;