mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-02-16 11:37:37 +01:00
Merge branch 'master' into develop
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
const validator = require('validator');
|
||||||
const _ = require('lodash');
|
const _ = require('lodash');
|
||||||
const nconf = require('nconf');
|
const nconf = require('nconf');
|
||||||
const db = require('../database');
|
const db = require('../database');
|
||||||
@@ -107,7 +108,13 @@ function renderUser(event) {
|
|||||||
if (!event.user || event.user.system) {
|
if (!event.user || event.user.system) {
|
||||||
return '[[global:system-user]]';
|
return '[[global:system-user]]';
|
||||||
}
|
}
|
||||||
return `${helpers.buildAvatar(event.user, '16px', true)} <a href="${relative_path}/user/${event.user.userslug}">${event.user.displayname}</a>`;
|
|
||||||
|
const user = {
|
||||||
|
...event.user,
|
||||||
|
displayname: validator.escape(String(event.user.displayname)),
|
||||||
|
};
|
||||||
|
|
||||||
|
return `${helpers.buildAvatar(user, '16px', true)} <a href="${relative_path}/user/${user.userslug}">${user.displayname}</a>`;
|
||||||
}
|
}
|
||||||
|
|
||||||
function renderTimeago(event) {
|
function renderTimeago(event) {
|
||||||
|
|||||||
Reference in New Issue
Block a user