Merge branch 'MDL-31520-MOODLE_21_STABLE' of git://github.com/fabioms…

…outo/moodle into MOODLE_21_STABLE
moodle · Jun 5, 2012 · 4c3a1c6 · 4c3a1c6
2 parents 8ad117c + 660b8d0
commit 4c3a1c6
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/user/lib.php b/user/lib.php
@@ -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;;
     }