From ace1faa08515e4f8305222079a20adf33bd04b36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 9 Mar 2016 09:02:07 +0100 Subject: [PATCH] Fixed parsing of field definition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #12083 Signed-off-by: Michal Čihař --- ChangeLog | 1 + libraries/tbl_columns_definition_form.inc.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 66bed1d319..db39ad342b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,6 +52,7 @@ phpMyAdmin - ChangeLog - issue #12054 Fixed processing of queries with escaped quotes - issue #12041 Fixed exporting tables with fields DEFAULT and COMMENT - issue #12073 Hide edit and delete buttons when the results are not related to a table +- issue #12083 Fixed parsing of field definition 4.5.5.1 (2016-02-29) - issue #11971 CREATE UNIQUE INDEX index type is not recognized by parser. diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php index 1dc5abeb1f..4fa2de4b7c 100644 --- a/libraries/tbl_columns_definition_form.inc.php +++ b/libraries/tbl_columns_definition_form.inc.php @@ -301,7 +301,7 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) { // differs from the ones of the corresponding database. // rtrim the type, for cases like "float unsigned" $type = rtrim( - mb_ereg_replace('[\w\W]character set[\w\W]*', '', $type) + preg_replace('/[\s]character set[\s][\S]+/', '', $type) ); /**