From 891f0cfe5247f350615f5f0d0814a748bf5f8210 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 2 Jan 2018 14:12:18 -0500
Subject: [PATCH] FIX: Don't display the `@mention` message if disabled

---
 .../discourse/templates/preferences/account.hbs           | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index cded185e598..fde2bd55bfd 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -7,9 +7,11 @@
       {{d-icon "pencil"}} {{/link-to}}
     {{/if}}
   </div>
-  <div class='instructions'>
-    {{{i18n 'user.username.short_instructions' username=model.username}}}
-  </div>
+  {{#if siteSettings.enable_mentions}}
+    <div class='instructions'>
+      {{{i18n 'user.username.short_instructions' username=model.username}}}
+    </div>
+  {{/if}}
 </div>
 
 {{#if canEditName}}