fix: scope

src/middleware/render.js

@@ -17,77 +17,77 @@ module.exports = function (middleware) {
 	middleware.processRender = function processRender(req, res, next) {
 		// res.render post-processing, modified from here: https://gist.github.com/mrlannigan/5051687
 		const { render } = res;
-		async function renderMethod(template, options, fn) {
+
+		res.render = async function renderOverride(template, options, fn) {
 			const self = this;
 			const { req } = this;
+			async function renderMethod(template, options, fn) {
+				options = options || {};
+				if (typeof options === 'function') {
+					fn = options;
+					options = {};
+				}
 
-			options = options || {};
-			if (typeof options === 'function') {
-				fn = options;
-				options = {};
-			}
-
-			options.loggedIn = req.uid > 0;
-			options.relative_path = relative_path;
-			options.template = { name: template, [template]: true };
-			options.url = (req.baseUrl + req.path.replace(/^\/api/, ''));
-			options.bodyClass = helpers.buildBodyClass(req, res, options);
-
-			const buildResult = await plugins.hooks.fire(`filter:${template}.build`, { req: req, res: res, templateData: options });
-			if (res.headersSent) {
-				return;
-			}
-			const templateToRender = buildResult.templateData.templateToRender || template;
+				options.loggedIn = req.uid > 0;
+				options.relative_path = relative_path;
+				options.template = { name: template, [template]: true };
+				options.url = (req.baseUrl + req.path.replace(/^\/api/, ''));
+				options.bodyClass = helpers.buildBodyClass(req, res, options);
 
-			const renderResult = await plugins.hooks.fire('filter:middleware.render', { req: req, res: res, templateData: buildResult.templateData });
-			if (res.headersSent) {
-				return;
-			}
-			options = renderResult.templateData;
-			options._header = {
-				tags: await meta.tags.parse(req, renderResult, res.locals.metaTags, res.locals.linkTags),
-			};
-			options.widgets = await widgets.render(req.uid, {
-				template: `${template}.tpl`,
-				url: options.url,
-				templateData: options,
-				req: req,
-				res: res,
-			});
-			res.locals.template = template;
-			options._locals = undefined;
-
-			if (res.locals.isAPI) {
-				if (req.route && req.route.path === '/api/') {
-					options.title = '[[pages:home]]';
+				const buildResult = await plugins.hooks.fire(`filter:${template}.build`, { req: req, res: res, templateData: options });
+				if (res.headersSent) {
+					return;
 				}
-				req.app.set('json spaces', global.env === 'development' || req.query.pretty ? 4 : 0);
-				return res.json(options);
-			}
+				const templateToRender = buildResult.templateData.templateToRender || template;
 
-			const results = await utils.promiseParallel({
-				header: renderHeaderFooter('renderHeader', req, res, options),
-				content: renderContent(render, templateToRender, req, res, options),
-				footer: renderHeaderFooter('renderFooter', req, res, options),
-			});
+				const renderResult = await plugins.hooks.fire('filter:middleware.render', { req: req, res: res, templateData: buildResult.templateData });
+				if (res.headersSent) {
+					return;
+				}
+				options = renderResult.templateData;
+				options._header = {
+					tags: await meta.tags.parse(req, renderResult, res.locals.metaTags, res.locals.linkTags),
+				};
+				options.widgets = await widgets.render(req.uid, {
+					template: `${template}.tpl`,
+					url: options.url,
+					templateData: options,
+					req: req,
+					res: res,
+				});
+				res.locals.template = template;
+				options._locals = undefined;
+
+				if (res.locals.isAPI) {
+					if (req.route && req.route.path === '/api/') {
+						options.title = '[[pages:home]]';
+					}
+					req.app.set('json spaces', global.env === 'development' || req.query.pretty ? 4 : 0);
+					return res.json(options);
+				}
 
-			const str = `${results.header +
-				(res.locals.postHeader || '') +
-				results.content
-			}<script id="ajaxify-data" type="application/json">${
-				JSON.stringify(options).replace(/<\//g, '<\\/')
-			}</script>${
-				res.locals.preFooter || ''
-			}${results.footer}`;
-
-			if (typeof fn !== 'function') {
-				self.send(str);
-			} else {
-				fn(null, str);
+				const results = await utils.promiseParallel({
+					header: renderHeaderFooter('renderHeader', req, res, options),
+					content: renderContent(render, templateToRender, req, res, options),
+					footer: renderHeaderFooter('renderFooter', req, res, options),
+				});
+
+				const str = `${results.header +
+					(res.locals.postHeader || '') +
+					results.content
+				}<script id="ajaxify-data" type="application/json">${
+					JSON.stringify(options).replace(/<\//g, '<\\/')
+				}</script>${
+					res.locals.preFooter || ''
+				}${results.footer}`;
+
+				if (typeof fn !== 'function') {
+					self.send(str);
+				} else {
+					fn(null, str);
+				}
 			}
-		}
 
-		res.render = async function renderOverride(template, options, fn) {
 			try {
 				await renderMethod(template, options, fn);
 			} catch (err) {