Merge branch 'master' of https://github.com/NodeBB/NodeBB

public/src/modules/helpers.js

@@ -313,7 +313,7 @@
 		}
 
 		styles.push('background-color: ' + userObj['icon:bgColor'] + ';');
-		return '<div ' + attributes.join(' ') + ' style="' + styles.join(' ') + '">' + userObj['icon:text'] + '</div>';
+		return '<span ' + attributes.join(' ') + ' style="' + styles.join(' ') + '">' + userObj['icon:text'] + '</span>';
 	}
 
 	function register() {

src/categories/recentreplies.js

@@ -138,7 +138,6 @@ module.exports = function (Categories) {
 						teaser.parentCid = parseInt(parentCids[teaser.cid], 10) || 0;
 						teaser.tid = undefined;
 						teaser.uid = undefined;
-						teaser.user.uid = undefined;
 						teaser.topic = {
 							slug: topicData[index].slug,
 							title: topicData[index].title,