From 9640a765560b337033dc0b52a23bc3559b16f90a Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Thu, 20 Apr 2023 14:05:14 +0100 Subject: [PATCH] Move $specialCharsEncoded out of getSpecialCharsAndBackupFieldForInsertingMode Signed-off-by: Kamil Tekiela --- libraries/classes/InsertEdit.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php index 8b4906bd3a..8b71ebe163 100644 --- a/libraries/classes/InsertEdit.php +++ b/libraries/classes/InsertEdit.php @@ -895,8 +895,8 @@ class InsertEdit /** * display default values * - * @return mixed[] $real_null_value, $data, $special_chars, $special_chars_encoded - * @psalm-return array{bool, string, string, string} + * @return mixed[] $real_null_value, $data, $special_chars + * @psalm-return array{bool, string, string} */ private function getSpecialCharsAndBackupFieldForInsertingMode( string|null $defaultValue, @@ -921,9 +921,7 @@ class InsertEdit $specialChars = htmlspecialchars($defaultValue); } - $specialCharsEncoded = Util::duplicateFirstNewline($specialChars); - - return [$realNullValue, $defaultValue, $specialChars, $specialCharsEncoded]; + return [$realNullValue, $defaultValue, $specialChars]; } /** @@ -1855,8 +1853,8 @@ class InsertEdit $realNullValue, $data, $specialChars, - $specialCharsEncoded, ] = $this->getSpecialCharsAndBackupFieldForInsertingMode($tmp['Default'] ?? null, $tmp['True_Type']); + $specialCharsEncoded = Util::duplicateFirstNewline($specialChars); $backupField = ''; unset($tmp); }