From 75f80e4c26633d3f1bca22fba4da8e06cfa386b3 Mon Sep 17 00:00:00 2001
From: Garvin Hicking <me@supergarv.de>
Date: Wed, 10 Dec 2003 10:27:37 +0000
Subject: [PATCH] bug 857186 - regex delimiter

---
 ChangeLog       | 5 +++++
 db_datadict.php | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1185a3b1f..365df98a9 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-12-10 Garvin Hicking <me@supergarv.de>
+    * db_datadict.php: Bug 857186: Real fix for the problem. The '@'
+      delimiter slipped to the replacement's end instead of the expression's
+      end.
+
 2003-12-09 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/sqlparser.data.php: bug 854702: FORCE INDEX
     * main.php: bug 851564: backquotes on the wildcard dbname
diff --git a/db_datadict.php b/db_datadict.php
index f697e59a6..7938dc3d4 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  = '';