Merging Stable fixes

diff --git a/user/view.php b/user/view.php
index 244e29a47e013dcf70ebfbdf83a4b8fe9eeefa90..b3a3a4d123fd1063710b5cb2e0511f57d71b2bd1 100644 (file)
--- a/user/view.php
+++ b/user/view.php
@@ -43,7 +43,7 @@
     if (groupmode($course) == SEPARATEGROUPS and !isteacheredit($course->id)) {   // Groups must be kept separate
         require_login();
 
-        if (!ismember(mygroupid($course->id), $user->id)) {
+        if (!isteacheredit($course->id, $user->id) and !ismember(mygroupid($course->id), $user->id)) {
             print_header("$personalprofile: ", "$personalprofile: ",
                          "<a href=\"../course/view.php?id=$course->id\">$course->shortname</a> ->
                           <a href=\"index.php?id=$course->id\">$participants</a>",