From fdec608c3e64685813771e39c0ebe1e2bf664102 Mon Sep 17 00:00:00 2001
From: Eric <eric.espie@combodo.com>
Date: Thu, 16 Jul 2020 18:09:44 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B03174=20-=20Remove=20stack=20trace=20from?=
 =?UTF-8?q?=20MySQLException?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/startup.inc.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/application/startup.inc.php b/application/startup.inc.php
index 4082d44b7..15514807a 100644
--- a/application/startup.inc.php
+++ b/application/startup.inc.php
@@ -35,7 +35,17 @@ register_shutdown_function(function()
 	$sReservedMemory = null;
 	if (!is_null($err = error_get_last()) && ($err['type'] == E_ERROR))
 	{
-		IssueLog::error($err['message']);
+		// Remove stack trace from MySQLException
+		$sMessage = $err['message'];
+		if (strpos($sMessage, 'MySQLException') !== false)
+		{
+			$iStackTracePos = strpos($sMessage, 'Stack trace:');
+			if ($iStackTracePos !== false)
+			{
+				$sMessage = substr($sMessage, 0, $iStackTracePos);
+			}
+		}
+		IssueLog::error($sMessage);
 		if (strpos($err['message'], 'Allowed memory size of') !== false)
 		{
 			$sLimit = ini_get('memory_limit');