From 384405d8e049633d798e2bced20958b2cf949dfb Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 21 Sep 2023 15:48:02 +0200
Subject: [PATCH] [ticket/17176] Fix our misuse of trigger_error() to work
 again

PHPBB3-17176
---
 phpBB/phpbb/debug/error_handler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/phpbb/debug/error_handler.php b/phpBB/phpbb/debug/error_handler.php
index 39949d47bd..e05f0798ee 100644
--- a/phpBB/phpbb/debug/error_handler.php
+++ b/phpBB/phpbb/debug/error_handler.php
@@ -31,7 +31,7 @@ class error_handler extends ErrorHandler
 	 */
 	public function handleError(int $type, string $message, string $file, int $line): bool
 	{
-		if (!$this->debug)
+		if (!$this->debug || $type === E_USER_WARNING || $type === E_USER_NOTICE)
 		{
 			$handler = defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler';