Permalink
Browse files

MDL-31520 user-ws: Optimised if statement for email access by moving …

…admin check to the start
  • Loading branch information...
1 parent 65d7459 commit 8d7887cdb5fd13f8e34abe376e4777aa68a9699d Sam Hemelryk committed Jun 5, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 user/lib.php
View
@@ -353,11 +353,11 @@ function user_get_user_details($user, $course = null, array $userfields = array(
}
}
- if (in_array('email', $userfields) && ($currentuser
+ if (in_array('email', $userfields) && ($isadmin // The admin is allowed the users email
+ or $currentuser // Of course the current user is as well
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 $isadmin)) {
+ or ($user->maildisplay == 2 and enrol_sharing_course($user, $USER)))) {
$userdetails['email'] = $user->email;
}

0 comments on commit 8d7887c

Please sign in to comment.