From 4e16ea32e385799dfef34e4c9528239ba71dbf7f Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Mon, 18 Jul 2016 11:12:38 -0400
Subject: Fixed highighting at all mentions when enabled (#3606)

---
 webapp/stores/user_store.jsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'webapp')

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;
-- 
cgit v1.2.3-1-g7c22