FIX: When emoji was disabled you could get a JS error in preview

2014-09-17 12:57:49 -04:00 · 2014-09-17 12:57:49 -04:00 · d472b4e10a
parent 4487d6a4c2
commit d472b4e10a
1 changed files with 1 additions and 1 deletions
--- 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;
      });
    }