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

One more regex escaping fix.

Browse Source
This commit is contained in:
Michal Čihař
2003-11-24 14:34:42 +00:00
parent 214aa81ee9
commit bf543ae759
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -10,6 +10,7 @@ $Source$
escaping of \ (once for PHP and once for PCRE). escaping of \ (once for PHP and once for PCRE).
* css/phpmyadmin.css.php: Make server selection in left frame same size as * css/phpmyadmin.css.php: Make server selection in left frame same size as
on other places. on other places.
* main.php: One more regex escaping fix.
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

4
main.php
View File

@@ -235,7 +235,7 @@ if ($server > 0) {
$rs_usr = PMA_mysql_query($local_query, $dbh); $rs_usr = PMA_mysql_query($local_query, $dbh);
} }
if ($rs_usr) { if ($rs_usr) {
$re0 = '@(^|(\\\\\\\\)+|[^\])'; // non-escaped wildcards $re0 = '@(^|(\\\\\\\\)+|[^\\\\])'; // non-escaped wildcards
$re1 = '@(^|[^\])(\\\)+'; // escaped wildcards $re1 = '@(^|[^\])(\\\)+'; // escaped wildcards
while ($row = PMA_mysql_fetch_row($rs_usr)) { while ($row = PMA_mysql_fetch_row($rs_usr)) {
$show_grants_dbname = substr($row[0], strpos($row[0], ' ON ') + 4,(strpos($row[0], '.', strpos($row[0], ' ON ')) - strpos($row[0], ' ON ') - 4)); $show_grants_dbname = substr($row[0], strpos($row[0], ' ON ') + 4,(strpos($row[0], '.', strpos($row[0], ' ON ')) - strpos($row[0], ' ON ') - 4));
@@ -650,4 +650,4 @@ if (PMA_MYSQL_INT_VERSION < 32336) {
*/ */
echo "\n"; echo "\n";
require('./footer.inc.php'); require('./footer.inc.php');
?> ?>