Merge branch 'MDL-31520-MOODLE_21_STABLE' of git://github.com/fabiomsouto/moodle into MOODLE_21_STABLE

2012-06-06 10:37:48 +12:00
parent 8ad117cca8 660b8d0b66
commit 4c3a1c6f8a
1 changed files with 2 additions and 1 deletions
@@ -312,7 +312,8 @@ function user_get_user_details($user, $course = null) {
    if ($currentuser
      or $canviewuseremail  // this is a capability in course context, it will be false in usercontext
      or $user->maildisplay == 1
-      or ($user->maildisplay == 2 and enrol_sharing_course($user, $USER))) {
+      or ($user->maildisplay == 2 and enrol_sharing_course($user, $USER))
+      or $isadmin) {
        $userdetails['email'] = $user->email;;
    }