Merge remote-tracking branch 'origin/stable' into pkgr

pkgr · Feb 1, 2016 · 005b468 · 005b468
2 parents 4a0fc22 + 51da667
commit 005b468
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
@@ -177,7 +177,9 @@ const User = RestModel.extend({
         if ((this.get('stream.filter') || ua.action_type) !== ua.action_type) return;
         if (!this.get('stream.filter') && !this.inAllStream(ua)) return;
 
-        const action = Discourse.UserAction.collapseStream([Discourse.UserAction.create(ua)]);
+        ua.title = Discourse.Emoji.unescape(Handlebars.Utils.escapeExpression(ua.title));
+        const action = UserAction.collapseStream([UserAction.create(ua)]);
+
         stream.set('itemsLoaded', stream.get('itemsLoaded') + 1);
         stream.get('content').insertAt(0, action[0]);
       }