From 5b96d9f7781b636af88e75c5927a564a95a64cce Mon Sep 17 00:00:00 2001
From: Stephen Abello <stephen.abello@combodo.com>
Date: Fri, 18 Feb 2022 10:17:14 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B04769=20Fix=20badly=20escaped=20run=20que?=
 =?UTF-8?q?ry=20suggestions=20containing=20multiple=20lines?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/run_query.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pages/run_query.php b/pages/run_query.php
index 747ef7f90..5010ef1f0 100644
--- a/pages/run_query.php
+++ b/pages/run_query.php
@@ -317,10 +317,16 @@ EOF
 					$sSyntaxErrorText .= "<p>Suggesting: $sFixedExpressionHtml</p>";
 					$oSyntaxErrorPanel->AddSubBlock(new Html($sSyntaxErrorText));
 
-					$sEscapedExpression = utils::EscapeHtml(addslashes($sFixedExpression));
+					$sEscapedExpression = json_encode(utils::EscapeHtml($sFixedExpression));
 					$oUseSuggestedQueryButton = ButtonUIBlockFactory::MakeForDestructiveAction('Use this query');
-					$oUseSuggestedQueryButton->SetOnClickJsCode("let \$oQueryTextarea = $('textarea[name=expression]');\$oQueryTextarea.val('$sEscapedExpression').focus();\$oQueryTextarea.closest('form').submit();");
-					$oSyntaxErrorPanel->AddSubBlock($oUseSuggestedQueryButton);
+					$oUseSuggestedQueryButton->SetOnClickJsCode(
+<<<JS
+let \$oQueryTextarea = $('textarea[name=expression]');
+\$oQueryTextarea.val($sEscapedExpression).focus();
+\$oQueryTextarea.closest('form').submit();
+JS
+					);
+						$oSyntaxErrorPanel->AddSubBlock($oUseSuggestedQueryButton);
 				} else {
 					$oSyntaxErrorPanel->AddSubBlock(HtmlFactory::MakeParagraph($e->getHtmlDesc()));
 				}