Merge branch 'master' into styleguide

This commit is contained in:
Julian Lam
2017-02-24 11:45:04 -05:00
15 changed files with 698 additions and 137 deletions

View File

@@ -298,7 +298,7 @@ topicsController.teaser = function (req, res, next) {
var tid = req.params.topic_id;
if (!utils.isNumber(tid)) {
return next(new Error('[[error:invalid-tid]]'));
return next();
}
async.waterfall([