FIX: Don't display the `@mention` message if disabled

2018-01-02 14:12:18 -05:00 · 2018-01-02 14:12:18 -05:00 · 891f0cfe52
parent a0b2b3c8a7
commit 891f0cfe52
1 changed files with 5 additions and 3 deletions
--- 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}}