Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

MDL-26822 user: Minor improvements post integration

  • Loading branch information...
commit b739e2d71a90fceebefdd3d4d3b01b3a559992ce 1 parent bcbfd02
Sam Hemelryk samhemelryk authored

Showing 1 changed file with 6 additions and 8 deletions. Show diff stats Hide diff stats

  1. +6 8 user/profile.php
14 user/profile.php
@@ -258,11 +258,11 @@
258 258 }
259 259
260 260 if (isset($identityfields['phone1']) && $user->phone1) {
261   - print_row(get_string("phone").":", "$user->phone1");
  261 + print_row(get_string("phone").":", "$user->phone1");
262 262 }
263 263
264 264 if (isset($identityfields['phone2']) && $user->phone2) {
265   - print_row(get_string("phone2").":", "$user->phone2");
  265 + print_row(get_string("phone2").":", "$user->phone2");
266 266 }
267 267
268 268 if (isset($identityfields['institution']) && $user->institution) {
@@ -273,16 +273,14 @@
273 273 print_row(get_string("department").":", "$user->department");
274 274 }
275 275
276   -if (isset($identityfields['idnumber']) && $user->idnumber) {
277   - print_row(get_string("idnumber").":", "$user->idnumber");
  276 +if (isset($identityfields['idnumber']) && $user->idnumber) {
  277 + print_row(get_string("idnumber").":", "$user->idnumber");
278 278 }
279 279
280   -if (($currentuser
  280 +if (isset($identityfields['email']) and ($currentuser
281 281 or $user->maildisplay == 1
282 282 or has_capability('moodle/course:useremail', $context)
283   - or ($user->maildisplay == 2 and enrol_sharing_course($user, $USER)))
284   - and isset($identityfields['email'])) {
285   -
  283 + or ($user->maildisplay == 2 and enrol_sharing_course($user, $USER)))) {
286 284 print_row(get_string("email").":", obfuscate_mailto($user->email, ''));
287 285 }
288 286

0 comments on commit b739e2d

Please sign in to comment.
Something went wrong with that request. Please try again.