diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-07-23 09:22:17 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-07-23 09:22:17 -0800 |
| commit | 8d9449c068902f51a97e7a6605cd226bf4a26f2e (patch) | |
| tree | eade41f7f9138de4f156016af9476486c227abec /web/react/stores/user_store.jsx | |
| parent | c277a98b5d88c81df39f8e33ef1286f72ac04014 (diff) | |
| parent | a9d48ff994cd2d03f8e1b2438e50fc6dd0d9bdc2 (diff) | |
| download | chat-8d9449c068902f51a97e7a6605cd226bf4a26f2e.tar.gz chat-8d9449c068902f51a97e7a6605cd226bf4a26f2e.tar.bz2 chat-8d9449c068902f51a97e7a6605cd226bf4a26f2e.zip | |
Merge branch 'master' into mm-1420
Diffstat (limited to 'web/react/stores/user_store.jsx')
| -rw-r--r-- | web/react/stores/user_store.jsx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/web/react/stores/user_store.jsx b/web/react/stores/user_store.jsx index d03016c5d..001162f47 100644 --- a/web/react/stores/user_store.jsx +++ b/web/react/stores/user_store.jsx @@ -183,6 +183,9 @@ var UserStore = assign({}, EventEmitter.prototype, { var keys = []; + if (!user) + return keys; + if (user.notify_props && user.notify_props.mention_keys) keys = keys.concat(user.notify_props.mention_keys.split(',')); if (user.first_name && user.notify_props.first_name === "true") keys.push(user.first_name); if (user.notify_props.all === "true") keys.push('@all'); @@ -258,4 +261,3 @@ UserStore.dispatchToken = AppDispatcher.register(function(payload) { UserStore.setMaxListeners(0); global.window.UserStore = UserStore; module.exports = UserStore; - |