From d472b4e10a21b19623c616cae97027b791bbfde7 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 17 Sep 2014 12:57:49 -0400
Subject: [PATCH] FIX: When emoji was disabled you could get a JS error in
 preview

---
 plugins/emoji/assets/javascripts/emoji.js.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/emoji/assets/javascripts/emoji.js.erb b/plugins/emoji/assets/javascripts/emoji.js.erb
index b85ab8b65..8e3ce3600 100644
--- a/plugins/emoji/assets/javascripts/emoji.js.erb
+++ b/plugins/emoji/assets/javascripts/emoji.js.erb
@@ -54,7 +54,7 @@
     } else {
       var replacement = translations[t];
       Discourse.Dialect.inlineReplace(t, function (token, match, prev) {
-        if (!Discourse.SiteSettings.enable_emoji) { return; }
+        if (!Discourse.SiteSettings.enable_emoji) { return token; }
         return checkPrev(prev) ? imageFor(replacement) : token;
       });
     }