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

MDL-26822 user: Minor improvements post integration

Browse source
This commit is contained in:
Sam Hemelryk 2012-09-03 11:41:07 +12:00
parent bcbfd02574
commit b739e2d71a
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
user/profile.php
View file

@ -258,11 +258,11 @@ if (isset($identityfields['address']) && $user->address) {
} }
if (isset($identityfields['phone1']) && $user->phone1) { if (isset($identityfields['phone1']) && $user->phone1) {
print_row(get_string("phone").":", "$user->phone1"); print_row(get_string("phone").":", "$user->phone1");
} }
if (isset($identityfields['phone2']) && $user->phone2) { if (isset($identityfields['phone2']) && $user->phone2) {
print_row(get_string("phone2").":", "$user->phone2"); print_row(get_string("phone2").":", "$user->phone2");
} }
if (isset($identityfields['institution']) && $user->institution) { if (isset($identityfields['institution']) && $user->institution) {
@ -273,16 +273,14 @@ if (isset($identityfields['department']) && $user->department) {
print_row(get_string("department").":", "$user->department"); print_row(get_string("department").":", "$user->department");
} }
if (isset($identityfields['idnumber']) && $user->idnumber) { if (isset($identityfields['idnumber']) && $user->idnumber) {
print_row(get_string("idnumber").":", "$user->idnumber"); print_row(get_string("idnumber").":", "$user->idnumber");
} }
if (($currentuser if (isset($identityfields['email']) and ($currentuser
or $user->maildisplay == 1 or $user->maildisplay == 1
or has_capability('moodle/course:useremail', $context) or has_capability('moodle/course:useremail', $context)
or ($user->maildisplay == 2 and enrol_sharing_course($user, $USER))) or ($user->maildisplay == 2 and enrol_sharing_course($user, $USER)))) {
and isset($identityfields['email'])) {
print_row(get_string("email").":", obfuscate_mailto($user->email, '')); print_row(get_string("email").":", obfuscate_mailto($user->email, ''));
} }