From ca774c940ecb99225d65c39995d080c84554b4a9 Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Wed, 6 Jun 2012 10:35:19 +1200 Subject: [PATCH] MDL-31520 user-ws: Optimised if statement for email access by moving admin check to the start --- user/lib.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user/lib.php b/user/lib.php index cf74c87fa17..bfa54764efc 100644 --- a/user/lib.php +++ b/user/lib.php @@ -380,11 +380,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; }