Merge pull request #3707 from tgxworld/emoji_not_unescape_in_topic_link

FIX: Emoji not unescaped in topic link.
2015-08-30 11:12:51 +02:00 · 2015-08-30 11:12:51 +02:00 · 322df1862d
parent 863b2a4fa1 430fc1421a
commit 322df1862d
1 changed files with 2 additions and 1 deletions
--- a/app/assets/javascripts/discourse/components/post-gutter.js.es6
+++ b/app/assets/javascripts/discourse/components/post-gutter.js.es6
@ -45,7 +45,8 @@ export default Em.Component.extend(StringBuffer, {

        var title = Em.get(l, 'title');
        if (!Em.isEmpty(title)) {
-          buffer.push(Handlebars.Utils.escapeExpression(title));
+          title = Handlebars.Utils.escapeExpression(title);
+          buffer.push(Discourse.Emoji.unescape(title));
        }
        if (clicks) {
          buffer.push("<span class='badge badge-notification clicks'>" + clicks + "</span>");