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

Use preg again, it just needs a bit more escaping of \ (once for PHP and once for PCRE).

Browse Source
This commit is contained in:
Michal Čihař
2003-11-24 12:42:38 +00:00
parent 4529330745
commit a66b1cc6b3
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-11-24 Michal Cihar <nijel@users.sourceforge.net>
* libraries/common.lib.php: Use preg again, it just needs a bit more
escaping of \ (once for PHP and once for PCRE).
2003-11-23 Alexander M. Turek <rabus@users.sourceforge.net> 2003-11-23 Alexander M. Turek <rabus@users.sourceforge.net>
* server_privileges.php3: while (list() = each()) is not always as bad as * server_privileges.php3: while (list() = each()) is not always as bad as
one might think ;-p one might think ;-p

4
libraries/common.lib.php
View File

@@ -1104,9 +1104,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
// We don't want more than one asterisk inside our 'only_db'. // We don't want more than one asterisk inside our 'only_db'.
continue; continue;
} }
if ($is_show_dbs && preg_match('@(^|[^\\\\])(_|%)@', $dblist[$i])) {
//if ($is_show_dbs && preg_match('@(^|[^\])(_|%)@', $dblist[$i])) {
if ($is_show_dbs && ereg('(^|[^\])(_|%)', $dblist[$i])) {
$local_query = 'SHOW DATABASES LIKE \'' . $dblist[$i] . '\''; $local_query = 'SHOW DATABASES LIKE \'' . $dblist[$i] . '\'';
$rs = PMA_mysql_query($local_query, $dbh); $rs = PMA_mysql_query($local_query, $dbh);
// "SHOW DATABASES" statement is disabled // "SHOW DATABASES" statement is disabled