Merge branch 'master' into develop

This commit is contained in:
Julian Lam
2017-04-13 16:45:46 -04:00
10 changed files with 32 additions and 19 deletions

View File

@@ -73,6 +73,7 @@ module.exports = function (Posts) {
};
function sanitizeSignature(signature) {
signature = translator.escape(signature);
var string = S(signature);
var tagsToStrip = [];

View File

@@ -10,7 +10,7 @@ var user = require('../user');
var plugins = require('../plugins');
var categories = require('../categories');
var utils = require('../utils');
var translator = require('../translator');
module.exports = function (Posts) {
Posts.getPostSummaryByPids = function (pids, uid, options, callback) {
@@ -119,7 +119,7 @@ module.exports = function (Posts) {
var cids = topics.map(function (topic) {
if (topic) {
topic.title = validator.escape(String(topic.title));
topic.title = translator.escape(validator.escape(String(topic.title)));
topic.deleted = parseInt(topic.deleted, 10) === 1;
}
return topic && topic.cid;