changing renderHeader function signature to req, res, next

src/controllers/admin.js

@@ -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 = {

src/middleware/admin.js

@@ -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;

src/middleware/middleware.js

@@ -129,12 +129,7 @@ middleware.buildHeader = function(req, res, next) {
 	});
 };
 
-/**
+middleware.renderHeader = function(req, res, callback) {
-* TODO: switch signature to req, res, callback
- *	`options` object	requires:	req, res
- *						accepts:	metaTags, linkTags
- */
-middleware.renderHeader = function (options, callback) {
 	var custom_header = {
 		'navigation': []
 	};
@@ -284,10 +279,7 @@ middleware.processRender = function(req, res, next) {
 			}
 
 			if (res.locals.renderHeader) {
-				middleware.renderHeader({
+				middleware.renderHeader(req, res, function(err, template) {
-					req: req,
-					res: res
-				}, function(err, template) {
 					str = template + str;
 
 					translator.translate(str, function(translated) {