mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-08 15:05:46 +01:00
changing renderHeader function signature to req, res, next
This commit is contained in:
@@ -157,7 +157,7 @@ adminController.database.get = function(req, res, next) {
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
// todo: deprecate this seemingly useless view
|
||||
adminController.topics.get = function(req, res, next) {
|
||||
topics.getAllTopics(0, 19, function (err, topics) {
|
||||
var data = {
|
||||
|
||||
@@ -13,7 +13,7 @@ var app,
|
||||
};
|
||||
|
||||
|
||||
middleware.isAdmin = function (req, res, next) {
|
||||
middleware.isAdmin = function(req, res, next) {
|
||||
user.isAdministrator((req.user && req.user.uid) ? req.user.uid : 0, function (err, isAdmin) {
|
||||
if (!isAdmin) {
|
||||
res.status(403);
|
||||
@@ -70,8 +70,6 @@ middleware.buildHeader = function(req, res, next) {
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
|
||||
module.exports = function(webserver) {
|
||||
app = webserver;
|
||||
return middleware;
|
||||
|
||||
@@ -129,12 +129,7 @@ middleware.buildHeader = function(req, res, next) {
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* TODO: switch signature to req, res, callback
|
||||
* `options` object requires: req, res
|
||||
* accepts: metaTags, linkTags
|
||||
*/
|
||||
middleware.renderHeader = function (options, callback) {
|
||||
middleware.renderHeader = function(req, res, callback) {
|
||||
var custom_header = {
|
||||
'navigation': []
|
||||
};
|
||||
@@ -284,10 +279,7 @@ middleware.processRender = function(req, res, next) {
|
||||
}
|
||||
|
||||
if (res.locals.renderHeader) {
|
||||
middleware.renderHeader({
|
||||
req: req,
|
||||
res: res
|
||||
}, function(err, template) {
|
||||
middleware.renderHeader(req, res, function(err, template) {
|
||||
str = template + str;
|
||||
|
||||
translator.translate(str, function(translated) {
|
||||
|
||||
Reference in New Issue
Block a user