Merge branch 'QA_4_6'

phpmyadmin · Mar 9, 2016 · 590593c · 590593c
2 parents 8b87d14 + ace1faa
commit 590593c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -61,6 +61,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
@@ -301,7 +301,7 @@
     // 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)
     );
 
     /**