diff --git a/app/assets/javascripts/discourse/lib/utilities.js b/app/assets/javascripts/discourse/lib/utilities.js index 01831c1c0..0e4e91352 100644 --- a/app/assets/javascripts/discourse/lib/utilities.js +++ b/app/assets/javascripts/discourse/lib/utilities.js @@ -56,8 +56,8 @@ Discourse.Utilities = { return "<img width='" + size + "' height='" + size + "' src='" + url + "' class='" + classes + "'" + title + ">"; }, - tinyAvatar: function(avatarTemplate) { - return Discourse.Utilities.avatarImg({avatarTemplate: avatarTemplate, size: 'tiny' }); + tinyAvatar: function(avatarTemplate, options) { + return Discourse.Utilities.avatarImg(_.merge({avatarTemplate: avatarTemplate, size: 'tiny' }, options)); }, postUrl: function(slug, topicId, postNumber) { diff --git a/app/assets/javascripts/discourse/views/actions_history_view.js b/app/assets/javascripts/discourse/views/actions_history_view.js index 5e3053478..61bb81c01 100644 --- a/app/assets/javascripts/discourse/views/actions_history_view.js +++ b/app/assets/javascripts/discourse/views/actions_history_view.js @@ -62,7 +62,7 @@ Discourse.ActionsHistoryComponent = Em.Component.extend({ if (post.get('deleted')) { buffer.push("<div class='post-action'>" + I18n.t("post.deleted_by") + " " + - Discourse.Utilities.tinyAvatar(post.get('postDeletedBy.avatar_template')) + + Discourse.Utilities.tinyAvatar(post.get('postDeletedBy.avatar_template'), {title: post.get('postDeletedBy.username')}) + Discourse.Formatter.autoUpdatingRelativeAge(new Date(post.get('postDeletedAt'))) + "</div>"); }