From 004371be366783798285fe3cb32978fc0068dc37 Mon Sep 17 00:00:00 2001
From: Hannah Wolfe <github.erisds@gmail.com>
Date: Wed, 1 Dec 2021 12:04:36 +0000
Subject: [PATCH] Revert "Removed overly-specific handling of handlebars
 errors"

This reverts commit 303ea87897833a70dc96af93e261e144da789e4f.

- Although gscan catches these now, we have a number of sites that have slipped through the net
- Reverting until we get them all cleaned up
---
 core/server/web/shared/middleware/error-handler.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/server/web/shared/middleware/error-handler.js b/core/server/web/shared/middleware/error-handler.js
index 6421adc468..6584ea384e 100644
--- a/core/server/web/shared/middleware/error-handler.js
+++ b/core/server/web/shared/middleware/error-handler.js
@@ -81,6 +81,14 @@ module.exports.prepareError = (err, req, res, next) => {
             err = new errors.NotFoundError({
                 err: err
             });
+        } else if (err.stack.match(/node_modules\/handlebars\//)) {
+            // Temporary handling of theme errors from handlebars
+            // @TODO remove this when #10496 is solved properly
+            err = new errors.IncorrectUsageError({
+                err: err,
+                message: err.message,
+                statusCode: err.statusCode
+            });
         } else {
             err = new errors.InternalServerError({
                 err: err,