moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-31520-master' of git://github.com/fabiomsouto/moodle

Browse source
This commit is contained in:
Sam Hemelryk 2012-06-06 10:33:31 +12:00
commit fd200bc5e5
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
user/lib.php
View file

@ -383,8 +383,9 @@ function user_get_user_details($user, $course = null, array $userfields = array(
if (in_array('email', $userfields) && ($currentuser if (in_array('email', $userfields) && ($currentuser
or $canviewuseremail // this is a capability in course context, it will be false in usercontext or $canviewuseremail // this is a capability in course context, it will be false in usercontext
or $user->maildisplay == 1 or $user->maildisplay == 1
or ($user->maildisplay == 2 and enrol_sharing_course($user, $USER)))) { or ($user->maildisplay == 2 and enrol_sharing_course($user, $USER))
$userdetails['email'] = $user->email;; or $isadmin)) {
$userdetails['email'] = $user->email;
} }
if (in_array('interests', $userfields) && !empty($CFG->usetags)) { if (in_array('interests', $userfields) && !empty($CFG->usetags)) {