Permalink
Browse files

Merge branch 'w24_MDL-33670_m21_ofadmin' of git://github.com/skodak/m…

…oodle into MOODLE_21_STABLE
  • Loading branch information...
stronk7 committed Jun 12, 2012
2 parents 9a36598 + ea1cb30 commit 417f9d311bc92f5af7a2142b54a9f2f23f09245a
Showing with 1 addition and 1 deletion.
  1. +1 −1 user/lib.php
View
@@ -310,7 +310,7 @@ function user_get_user_details($user, $course = null) {
}
if ($isadmin
- of $currentuser
+ or $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))) {

0 comments on commit 417f9d3

Please sign in to comment.