diff --git a/ChangeLog b/ChangeLog index 6ff524b1d..af5e3de7b 100755 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ $Source$ escaping of \ (once for PHP and once for PCRE). * css/phpmyadmin.css.php: Make server selection in left frame same size as on other places. + * main.php: One more regex escaping fix. 2003-11-23 Alexander M. Turek * server_privileges.php3: while (list() = each()) is not always as bad as diff --git a/main.php b/main.php index 93593045e..6ed1c735a 100644 --- a/main.php +++ b/main.php @@ -235,7 +235,7 @@ if ($server > 0) { $rs_usr = PMA_mysql_query($local_query, $dbh); } if ($rs_usr) { - $re0 = '@(^|(\\\\\\\\)+|[^\])'; // non-escaped wildcards + $re0 = '@(^|(\\\\\\\\)+|[^\\\\])'; // non-escaped wildcards $re1 = '@(^|[^\])(\\\)+'; // escaped wildcards 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)); @@ -650,4 +650,4 @@ if (PMA_MYSQL_INT_VERSION < 32336) { */ echo "\n"; require('./footer.inc.php'); -?> \ No newline at end of file +?>