From c36a2cef021cf19ade0334bccf2740b2a570b9ac Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Sun, 28 Jul 2019 23:24:54 +0200 Subject: [PATCH 1/2] Fix #15363 Remove unexpected quotes on text fields Signed-off-by: Hugues Peccatte --- libraries/classes/InsertEdit.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php index 9c11a34f79..6b07769b3a 100644 --- a/libraries/classes/InsertEdit.php +++ b/libraries/classes/InsertEdit.php @@ -2077,6 +2077,8 @@ class InsertEdit $special_chars = Util::addMicroseconds($column['Default']); } elseif ($trueType == 'binary' || $trueType == 'varbinary') { $special_chars = bin2hex($column['Default']); + } elseif ('text' === substr($trueType, -4) || 'char' === substr($trueType, -4)) { + $special_chars = empty($column['Default']) ? '' : substr($column['Default'], 1, -1); } else { $special_chars = htmlspecialchars($column['Default']); } From b4d3b07476fdcc4893cc41bf9f85dad2fdede090 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 15 Aug 2019 22:13:01 +0200 Subject: [PATCH 2/2] Fix #15363 - Remove unexpected quotes on text fields Signed-off-by: William Desportes --- .../classes/Controllers/Table/TableStructureController.php | 6 ++++++ libraries/classes/InsertEdit.php | 4 ++-- libraries/tbl_columns_definition_form.inc.php | 5 +++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/libraries/classes/Controllers/Table/TableStructureController.php b/libraries/classes/Controllers/Table/TableStructureController.php index 8e38edc525..be7a1799b3 100644 --- a/libraries/classes/Controllers/Table/TableStructureController.php +++ b/libraries/classes/Controllers/Table/TableStructureController.php @@ -371,6 +371,12 @@ class TableStructureController extends TableController $this->db, $this->table, null, true ); + foreach ($fields as $key => $row) { + if ('text' === substr($row['Type'], -4)) { + $fields[$key]['Default'] = stripcslashes(substr($row['Default'], 1, -1)); + } + } + //display table structure $this->response->addHTML( $this->displayStructure( diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php index 6b07769b3a..1282b3e44a 100644 --- a/libraries/classes/InsertEdit.php +++ b/libraries/classes/InsertEdit.php @@ -2077,8 +2077,8 @@ class InsertEdit $special_chars = Util::addMicroseconds($column['Default']); } elseif ($trueType == 'binary' || $trueType == 'varbinary') { $special_chars = bin2hex($column['Default']); - } elseif ('text' === substr($trueType, -4) || 'char' === substr($trueType, -4)) { - $special_chars = empty($column['Default']) ? '' : substr($column['Default'], 1, -1); + } elseif ('text' === substr($trueType, -4)) { + $special_chars = stripcslashes(substr($column['Default'], 1, -1)); } else { $special_chars = htmlspecialchars($column['Default']); } diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php index ca42075091..eacfa5a995 100644 --- a/libraries/tbl_columns_definition_form.inc.php +++ b/libraries/tbl_columns_definition_form.inc.php @@ -263,6 +263,11 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) { break; default: $columnMeta['DefaultType'] = 'USER_DEFINED'; + + if ('text' === substr($columnMeta['Type'], -4)) { + $columnMeta['Default'] = stripcslashes(substr($columnMeta['Default'], 1, -1)); + } + $columnMeta['DefaultValue'] = $columnMeta['Default']; break; }