mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-16 22:15:24 +02:00
Code Issues Projects Releases Wiki Activity

MDL-31520 user-ws: Optimised if statement for email access by moving admin check to the start

Browse Source
This commit is contained in:
Sam Hemelryk 2012-06-06 10:35:19 +12:00
parent fd200bc5e5
commit ca774c940e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
user/lib.php
View File

@ -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;
}