We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 61a3ccf2 authored by Evan Prodromou's avatar Evan Prodromou

users can choose to just see nicknames in streams

parent ddc121c0
......@@ -219,8 +219,14 @@ class NoticeListItem extends Widget
$this->out->elementStart('a', $attrs);
$this->showAvatar();
$this->out->text(' ');
$this->out->element('span',array('class' => 'fn'),
$this->profile->getBestName());
$user = common_current_user();
if (!empty($user) && $user->streamNicknames()) {
$this->out->element('span',array('class' => 'fn'),
$this->profile->nickname);
} else {
$this->out->element('span',array('class' => 'fn'),
$this->profile->getBestName());
}
$this->out->elementEnd('a');
$this->out->elementEnd('span');
......@@ -262,11 +268,15 @@ class NoticeListItem extends Widget
$groups = $this->getGroups();
$user = common_current_user();
$streamNicknames = !empty($user) && $user->streamNicknames();
foreach ($groups as $group) {
$ga[] = array('href' => $group->homeUrl(),
'title' => $group->nickname,
'class' => 'addressee group',
'text' => $group->getBestName());
'text' => ($streamNicknames) ? $group->nickname : $group->getBestName());
}
return $ga;
......@@ -283,11 +293,15 @@ class NoticeListItem extends Widget
$replies = $this->getReplyProfiles();
$user = common_current_user();
$streamNicknames = !empty($user) && $user->streamNicknames();
foreach ($replies as $reply) {
$pa[] = array('href' => $reply->profileurl,
'title' => $reply->nickname,
'class' => 'addressee account',
'text' => $reply->getBestName());
'text' => ($streamNicknames) ? $reply->nickname : $reply->getBestName());
}
return $pa;
......
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