about summary refs log tree commit diff
path: root/app/javascript/mastodon/components/display_name.js
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-02-19 20:00:41 +0100
committerEugen Rochko <eugen@zeonfederated.com>2019-02-19 20:00:41 +0100
commit8e7fc7ec73c0743df378403ad2e704c9fae70400 (patch)
tree1854973cf6c756f433664de7020e3ae1f8c3cabc /app/javascript/mastodon/components/display_name.js
parent359d26a05345895f295a91b7728fe711cd280f84 (diff)
Fix crash when conversations have no valid participants (#10078)
* Never return empty participants for conversations

Fixes #10068

* Fix client-side crash when conversations have no participants
Diffstat (limited to 'app/javascript/mastodon/components/display_name.js')
-rw-r--r--app/javascript/mastodon/components/display_name.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/components/display_name.js b/app/javascript/mastodon/components/display_name.js
index 32809778a..6b9dd6f81 100644
--- a/app/javascript/mastodon/components/display_name.js
+++ b/app/javascript/mastodon/components/display_name.js
@@ -22,7 +22,7 @@ export default class DisplayName extends React.PureComponent {
         suffix = `+${others.size - 2}`;
       }
     } else {
-      if (others) {
+      if (others && others.size > 0) {
         account = others.first();
       } else {
         account = this.props.account;