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

Fixed one case of reload detection (I forgot to update second regexp on 2004-08-16) (bug #1011479).

Browse Source
This commit is contained in:
Michal Čihař
2004-08-19 09:56:26 +00:00
parent e9f19691b9
commit f895465cdc
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$
$Source$
2004-08-19 Michal Čihař <michal@cihar.com>
* read_dump.php: Fixed one case of reload detection (I forgot to update
second regexp on 2004-08-16) (bug #1011479).
2004-08-17 Michal Čihař <michal@cihar.com>
* sql.php: Work with $display_query only if set (Marc spotted this out).
* libraries/display_export.lib.php: No options text should not be bold red

2
read_dump.php
View File

@@ -312,7 +312,7 @@ if ($sql_query != '') {
}
// .*? bellow is non greedy expansion, just in case somebody wants to understand it...
if (!isset($reload) && preg_match('@^((-- |#)^[\n]*|/\*.*?\*/)*(DROP|CREATE)[[:space:]]+(IF EXISTS[[:space:]]+)?(TABLE|DATABASE)[[:space:]]+(.+)@i', $a_sql_query)) {
if (!isset($reload) && preg_match('@^((-- |#)[^\n]*\n|/\*.*?\*/)*(DROP|CREATE)[[:space:]]+(IF EXISTS[[:space:]]+)?(TABLE|DATABASE)[[:space:]]+(.+)@i', $sql_query)) {
$reload = 1;
}
} // end for