diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-07-17 10:19:50 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-07-17 10:19:50 -0400 |
| commit | 05d6a3a8128ea9b901a3f6eba0bd048b0464a390 (patch) | |
| tree | af1e66b0cd8bffd8fbc51d1a8628c649d01b0b23 /web/react/stores/user_store.jsx | |
| parent | 7fae4db6e676c44d23eeff56d856dd13cb77b7e7 (diff) | |
| parent | 56db6ad08cf23dbdcee326fa39bda8bcdcdecf9e (diff) | |
| download | chat-05d6a3a8128ea9b901a3f6eba0bd048b0464a390.tar.gz chat-05d6a3a8128ea9b901a3f6eba0bd048b0464a390.tar.bz2 chat-05d6a3a8128ea9b901a3f6eba0bd048b0464a390.zip | |
Merge pull request #193 from ralder/fix-manage-members-town-square
[webui] remove admin's ability to manage members of default channel fixes (#172)
Diffstat (limited to 'web/react/stores/user_store.jsx')
| -rw-r--r-- | web/react/stores/user_store.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/stores/user_store.jsx b/web/react/stores/user_store.jsx index 93ddfec70..dd207ca80 100644 --- a/web/react/stores/user_store.jsx +++ b/web/react/stores/user_store.jsx @@ -177,7 +177,7 @@ var UserStore = assign({}, EventEmitter.prototype, { }, getCurrentMentionKeys: function() { var user = this.getCurrentUser(); - if (user.notify_props && user.notify_props.mention_keys) { + if (user && user.notify_props && user.notify_props.mention_keys) { var keys = user.notify_props.mention_keys.split(','); if (user.full_name.length > 0 && user.notify_props.first_name === "true") { |