Permalink
Browse files

MDL-26822 user: Minor improvements post integration

  • Loading branch information...
1 parent 0363a5b commit cc21d0ff6ea6ea0ef4520bf105211306d8c5c5c0 Sam Hemelryk committed Sep 2, 2012
Showing with 6 additions and 8 deletions.
  1. +6 −8 user/profile.php
View
@@ -258,11 +258,11 @@
}
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) {
- print_row(get_string("phone2").":", "$user->phone2");
+ print_row(get_string("phone2").":", "$user->phone2");
}
if (isset($identityfields['institution']) && $user->institution) {
@@ -273,16 +273,14 @@
print_row(get_string("department").":", "$user->department");
}
-if (isset($identityfields['idnumber']) && $user->idnumber) {
- print_row(get_string("idnumber").":", "$user->idnumber");
+if (isset($identityfields['idnumber']) && $user->idnumber) {
+ print_row(get_string("idnumber").":", "$user->idnumber");
}
-if (($currentuser
+if (isset($identityfields['email']) and ($currentuser
or $user->maildisplay == 1
or has_capability('moodle/course:useremail', $context)
- or ($user->maildisplay == 2 and enrol_sharing_course($user, $USER)))
- and isset($identityfields['email'])) {
-
+ or ($user->maildisplay == 2 and enrol_sharing_course($user, $USER)))) {
print_row(get_string("email").":", obfuscate_mailto($user->email, ''));
}

0 comments on commit cc21d0f

Please sign in to comment.