Commit 0ee345bc authored by Cecilia Vela Gurovic's avatar Cecilia Vela Gurovic Committed by Gerrit Code Review
Browse files

Merge "Bug 1839581: Allow chosen name to not have username displayed"

parents 1e990d32 ec9cfbdc
......@@ -50,7 +50,7 @@ while ($more && count($tmpuser) < $usersperpage) {
'id' => $user['id'],
'text' => '<img class="select2-user-icon" src="' . get_config('wwwroot') . 'thumb.php?type=profileicon&maxwidth=40&maxheight=40&id=' . $user['id'] . '" />' .
'<span>' . hsc(display_name($user['id'])) . '</span>',
'name' => hsc(display_name($user['id']))
'name' => hsc(display_name($user['id'], null, true))
);
}
$page++;
......
......@@ -278,7 +278,7 @@ function translate_ids_to_names(array $ids) {
foreach ($ids as $id) {
$deleted = get_field('usr', 'deleted', 'id', $id);
if (($deleted === '0') && is_numeric($id) && can_send_message($USER->to_stdclass(), $id)) {
$results[] = (object) array('id' => $id, 'text' => hsc(display_name($id)));
$results[] = (object) array('id' => $id, 'text' => hsc(display_name($id, null, true)));
}
}
return $results;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment