From 2c284874b47c99cba518841082b4932f0fbf275d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 11 Sep 2017 22:47:47 +0200
Subject: [PATCH] FIX: icon showing as null

---
 .../javascripts/discourse/components/select-box.js.es6       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/select-box.js.es6 b/app/assets/javascripts/discourse/components/select-box.js.es6
index 89aa8ef14f9..5a9bd882586 100644
--- a/app/assets/javascripts/discourse/components/select-box.js.es6
+++ b/app/assets/javascripts/discourse/components/select-box.js.es6
@@ -86,7 +86,10 @@ export default Ember.Component.extend({
     return (rowComponent) => {
       let template = "";
 
-      template += rowComponent.icon();
+      const icon = rowComponent.icon()
+      if (icon) {
+        template += icon;
+      }
 
       const text = rowComponent.get(`content.${this.get("textKey")}`);
       template += `<p class="text">${Handlebars.escapeExpression(text)}</p>`;