Skip to content
Permalink
Browse files

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

…outo/moodle into MOODLE_21_STABLE
  • Loading branch information...
Sam Hemelryk
Sam Hemelryk committed Jun 5, 2012
2 parents 8ad117c + 660b8d0 commit 4c3a1c6f8a6e08d921d91d8ee5592a31d0b2de70
Showing with 2 additions and 1 deletion.
  1. +2 −1 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;;
}

0 comments on commit 4c3a1c6

Please sign in to comment.
You can’t perform that action at this time.