From 1bd76fc47413a5bc3d37bcfdb4b2971584b5df1e Mon Sep 17 00:00:00 2001 From: William Desportes Date: Wed, 23 Jun 2021 13:31:21 +0200 Subject: [PATCH] Ref #16977 - Fix selected value for enum get values route Signed-off-by: William Desportes --- libraries/classes/Controllers/SqlController.php | 5 ++++- test/classes/Controllers/SqlControllerTest.php | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libraries/classes/Controllers/SqlController.php b/libraries/classes/Controllers/SqlController.php index 64682b2bbd..90897dca69 100644 --- a/libraries/classes/Controllers/SqlController.php +++ b/libraries/classes/Controllers/SqlController.php @@ -269,9 +269,12 @@ class SqlController extends AbstractController return; } + // Converts characters of $curr_value to HTML entities. + $convertedCurrentValue = htmlentities($curr_value, ENT_COMPAT, 'UTF-8'); + $dropdown = $this->template->render('sql/enum_column_dropdown', [ 'values' => $values, - 'selected_values' => [$curr_value], + 'selected_values' => [$convertedCurrentValue], ]); $this->response->addJSON('dropdown', $dropdown); diff --git a/test/classes/Controllers/SqlControllerTest.php b/test/classes/Controllers/SqlControllerTest.php index 01c127a5b9..011cea875e 100644 --- a/test/classes/Controllers/SqlControllerTest.php +++ b/test/classes/Controllers/SqlControllerTest.php @@ -195,7 +195,7 @@ class SqlControllerTest extends AbstractTestCase 'dropdown' => '' . "\n",