From efc4fc3ddc1736d0568acaea744e0dcccee16c42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Fri, 18 Jun 2021 09:55:08 -0400
Subject: [PATCH] fix: merge

---
 src/controllers/errors.js | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/controllers/errors.js b/src/controllers/errors.js
index bb8951b038..671f3beccb 100644
--- a/src/controllers/errors.js
+++ b/src/controllers/errors.js
@@ -1,10 +1,11 @@
 'use strict';
 
-var nconf = require('nconf');
-var winston = require('winston');
-var validator = require('validator');
-var plugins = require('../plugins');
-var middleware = require('../middleware');
+const nconf = require('nconf');
+const winston = require('winston');
+const validator = require('validator');
+const plugins = require('../plugins');
+const middleware = require('../middleware');
+const helpers = require('../middleware/helpers');
 
 exports.handleURIErrors = async function handleURIErrors(err, req, res, next) {
 	// Handle cases where malformed URIs are passed in
@@ -56,12 +57,17 @@ exports.handleErrors = function handleErrors(err, req, res, next) { // eslint-di
 
 		res.status(status || 500);
 
-		var path = String(req.path || '');
+		const path = String(req.path || '');
+		const data = {
+			path: validator.escape(path),
+			error: validator.escape(String(err.message)),
+			bodyClass: helpers.buildBodyClass(req, res),
+		};
 		if (res.locals.isAPI) {
-			res.json({ path: validator.escape(path), error: err.message });
+			res.json(data);
 		} else {
 			await middleware.buildHeaderAsync(req, res);
-			res.render('500', { path: validator.escape(path), error: validator.escape(String(err.message)) });
+			res.render('500', data);
 		}
 	};