nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 857186 - regex delimiter

Browse Source
This commit is contained in:
Garvin Hicking
2003-12-10 10:27:37 +00:00
parent 71c35d8108
commit 75f80e4c26
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $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> 2003-12-09 Marc Delisle <lem9@users.sourceforge.net>
* libraries/sqlparser.data.php: bug 854702: FORCE INDEX * libraries/sqlparser.data.php: bug 854702: FORCE INDEX
* main.php: bug 851564: backquotes on the wildcard dbname * main.php: bug 851564: backquotes on the wildcard dbname

2
db_datadict.php
View File

@@ -199,7 +199,7 @@ while ($row = mysql_fetch_array($rowset)) {
// reformat mysql query output - staybyte - 9. June 2001 // reformat mysql query output - staybyte - 9. June 2001
// loic1: set or enum types: slashes single quotes inside options // loic1: set or enum types: slashes single quotes inside options
if (preg_match('@^(set|enum)\((.+)\)$@i', $type, $tmp)) { 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 = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';
$type_nowrap = ''; $type_nowrap = '';