Merge remote-tracking branch 'origin/develop' into develop

pull/21833/head
Weblate 2018-04-09 21:59:56 +00:00
commit e7929fb281
1 changed files with 1 additions and 0 deletions

View File

@ -207,6 +207,7 @@ const Pill = React.createClass({
const member = this.state.member; const member = this.state.member;
if (member) { if (member) {
userId = member.userId; userId = member.userId;
member.rawDisplayName = member.rawDisplayName || '';
linkText = member.rawDisplayName.replace(' (IRC)', ''); // FIXME when groups are done linkText = member.rawDisplayName.replace(' (IRC)', ''); // FIXME when groups are done
if (this.props.shouldShowPillAvatar) { if (this.props.shouldShowPillAvatar) {
avatar = <MemberAvatar member={member} width={16} height={16} />; avatar = <MemberAvatar member={member} width={16} height={16} />;