L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-52892-29_STABLE' of https://github.com/dg711/moodle into MOODLE_29_STABLE

Browse Source
This commit is contained in:
Andrew Nicols
2016-02-23 10:20:34 +08:00
parent 3fe95f7007 800b8ebcaf
commit 12dcda9f4b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/lib.php
+5 -5
View File
@@ -1438,11 +1438,7 @@ function message_print_user ($user=false, $iscontact=false, $isblocked=false, $i
if ($user === false) {
echo $OUTPUT->user_picture($USER, $userpictureparams);
} else if (core_user::is_real_user($user->id)) { // If not real user, then don't show any links.
$userpictureparams['link'] = false;
echo $OUTPUT->user_picture($USER, $userpictureparams);
echo fullname($user);
} else {
} else if (core_user::is_real_user($user->id)) {
echo $OUTPUT->user_picture($user, $userpictureparams);
$link = new moodle_url("/message/index.php?id=$user->id");
@@ -1462,6 +1458,10 @@ function message_print_user ($user=false, $iscontact=false, $isblocked=false, $i
} else {
message_contact_link($user->id, 'block', $return, $script, $includeicontext);
}
} else { // If not real user, then don't show any links.
$userpictureparams['link'] = false;
echo $OUTPUT->user_picture($USER, $userpictureparams);
echo fullname($user);
}
}