From a8be9563d7d39996b28b2428778a82d65b1efa1a Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 9 Dec 2003 22:07:02 +0000 Subject: [PATCH] bug 857186 --- ChangeLog | 2 ++ db_datadict.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 52aef9664..1185a3b1f 100755 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,8 @@ $Source$ * libraries/sqlparser.data.php: bug 854702: FORCE INDEX * main.php: bug 851564: backquotes on the wildcard dbname when no controluser is defined + * db_datadict.php: bug 857186: ENUMs and data dictionary, + thanks to Andrew Weiner (landreww) for the report and fix 2003-12-09 Garvin Hicking * tbl_change.php: Fixed Bug #856436 (not displaying default values) diff --git a/db_datadict.php b/db_datadict.php index 7df1f896f..f697e59a6 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -199,7 +199,7 @@ while ($row = mysql_fetch_array($rowset)) { // reformat mysql query output - staybyte - 9. June 2001 // loic1: set or enum types: slashes single quotes inside options if (preg_match('@^(set|enum)\((.+)\)$@i', $type, $tmp)) { - $tmp[2] = substr(preg_replace('@([^,])\'\'', '\\1\\\'@', ',' . $tmp[2]), 1); + $tmp[2] = substr(preg_replace('/@([^,])\'\'/', '\\1\\\'@', ',' . $tmp[2]), 1); $type = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')'; $type_nowrap = '';