mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-12-22 16:30:34 +01:00
Merge branch 'master' into develop
This commit is contained in:
@@ -220,9 +220,9 @@ module.exports = function (utils, Benchpress, relative_path) {
|
||||
|
||||
function renderTopicImage(topicObj) {
|
||||
if (topicObj.thumb) {
|
||||
return '<img src="' + topicObj.thumb + '" class="img-circle user-img" title="' + topicObj.user.username + '" />';
|
||||
return '<img src="' + topicObj.thumb + '" class="img-circle user-img" title="' + topicObj.user.displayname + '" />';
|
||||
}
|
||||
return '<img component="user/picture" data-uid="' + topicObj.user.uid + '" src="' + topicObj.user.picture + '" class="user-img" title="' + topicObj.user.username + '" />';
|
||||
return '<img component="user/picture" data-uid="' + topicObj.user.uid + '" src="' + topicObj.user.picture + '" class="user-img" title="' + topicObj.user.displayname + '" />';
|
||||
}
|
||||
|
||||
function renderDigestAvatar(block) {
|
||||
@@ -319,7 +319,7 @@ module.exports = function (utils, Benchpress, relative_path) {
|
||||
let output = '';
|
||||
|
||||
if (userObj.picture) {
|
||||
output += `<img${attr2String(attributes)} alt="${userObj.username}" loading="lazy" component="${component || 'avatar/picture'}" src="${userObj.picture}" style="${styles.join(' ')}" onError="this.remove()" itemprop="image" />`;
|
||||
output += `<img${attr2String(attributes)} alt="${userObj.displayname}" loading="lazy" component="${component || 'avatar/picture'}" src="${userObj.picture}" style="${styles.join(' ')}" onError="this.remove()" itemprop="image" />`;
|
||||
}
|
||||
output += `<span${attr2String(attributes)} component="${component || 'avatar/icon'}" style="${styles.join(' ')} background-color: ${userObj['icon:bgColor']}">${userObj['icon:text']}</span>`;
|
||||
return output;
|
||||
@@ -393,7 +393,7 @@ module.exports = function (utils, Benchpress, relative_path) {
|
||||
</li>`;
|
||||
});
|
||||
|
||||
return html;
|
||||
return html.join('');
|
||||
}
|
||||
|
||||
function register() {
|
||||
|
||||
Reference in New Issue
Block a user