From 207bf1b3397f1ae7b85715362660523bb62ccb23 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 25 Mar 2016 12:54:33 -0400
Subject: [PATCH] FIX: Broken Javscript test

---
 app/assets/javascripts/discourse/controllers/badges/show.js.es6 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/controllers/badges/show.js.es6 b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
index 1346bf64364..52a4c7395c0 100644
--- a/app/assets/javascripts/discourse/controllers/badges/show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
@@ -48,7 +48,7 @@ export default Ember.Controller.extend({
 
   @computed('model.long_description')
   longDescription(modelLongDesc) {
-    return Discourse.Emoji.unescape(modelLongDesc);
+    return Discourse.Emoji.unescape(modelLongDesc || '');
   }
 
 });