summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-07-18 11:12:38 -0400
committerJoram Wilander <jwawilander@gmail.com>2016-07-18 11:12:38 -0400
commit4e16ea32e385799dfef34e4c9528239ba71dbf7f (patch)
tree58b6e10de44be3b1762335745bb2d0ed358f5977 /webapp
parentb353cc2cab832afa04d10818bdeeb8b17f40cd95 (diff)
downloadchat-4e16ea32e385799dfef34e4c9528239ba71dbf7f.tar.gz
chat-4e16ea32e385799dfef34e4c9528239ba71dbf7f.tar.bz2
chat-4e16ea32e385799dfef34e4c9528239ba71dbf7f.zip
Fixed highighting at all mentions when enabled (#3606)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/stores/user_store.jsx5
1 files changed, 1 insertions, 4 deletions
diff --git a/webapp/stores/user_store.jsx b/webapp/stores/user_store.jsx
index 8936b1e49..99550f3ce 100644
--- a/webapp/stores/user_store.jsx
+++ b/webapp/stores/user_store.jsx
@@ -281,12 +281,9 @@ class UserStoreClass extends EventEmitter {
keys.push(user.first_name);
}
- if (user.notify_props.all === 'true') {
- keys.push('@all');
- }
-
if (user.notify_props.channel === 'true') {
keys.push('@channel');
+ keys.push('@all');
}
return keys;