From 5d12db1fb502af441e8361c895df044d537ac164 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sat, 26 Aug 2017 02:44:36 +0200
Subject: [PATCH] FIX: html not showing in select-box header

---
 .../discourse/components/category-select-box.js.es6           | 4 ++--
 .../templates/components/select-box/select-box-header.hbs     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/category-select-box.js.es6 b/app/assets/javascripts/discourse/components/category-select-box.js.es6
index 931408c4727..eca4c381be1 100644
--- a/app/assets/javascripts/discourse/components/category-select-box.js.es6
+++ b/app/assets/javascripts/discourse/components/category-select-box.js.es6
@@ -44,13 +44,13 @@ export default SelectBoxComponent.extend({
       if (this.siteSettings.allow_uncategorized_topics) {
         headerText = Ember.get(Category.findUncategorized(), this.get("textKey"));
       } else {
-        headerText = I18n.t("category.choose");
+        headerText = I18n.t("category.choose").htmlSafe();
       }
     } else {
       headerText = this.get("selectedContent.text");
     }
 
-    this.set("headerText", Handlebars.escapeExpression(headerText));
+    this.set("headerText", headerText);
   },
 
   // original method is kept for compatibility
diff --git a/app/assets/javascripts/discourse/templates/components/select-box/select-box-header.hbs b/app/assets/javascripts/discourse/templates/components/select-box/select-box-header.hbs
index 14184521797..cf3812c0dbe 100644
--- a/app/assets/javascripts/discourse/templates/components/select-box/select-box-header.hbs
+++ b/app/assets/javascripts/discourse/templates/components/select-box/select-box-header.hbs
@@ -3,7 +3,7 @@
 {{/if}}
 
 <span class="current-selection">
-  {{{text}}}
+  {{text}}
 </span>
 
 {{d-icon caretIcon class="caret-icon"}}