diff --git a/ChangeLog b/ChangeLog index 555086031..c7ea30df5 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2005-01-27 Michal Čihař + * read_dump.php: Fix detection of SELECT query to display on multiple + submits (bug #1110727). + 2005-01-23 Marc Delisle * tbl_query_box.php: bug #1107937, undefined $fields_list * lang/estonian: Update thanks to Alvar Soome - finsoft. diff --git a/read_dump.php b/read_dump.php index c029fe8ce..5b61b56a0 100644 --- a/read_dump.php +++ b/read_dump.php @@ -275,7 +275,7 @@ if ($sql_query != '') { // .*? below is non greedy expansion, just in case somebody wants to understand it... // looks ok here without using PCRE_MULTILINE - if ($i == $count - 1 && preg_match('@^((-- |#)[^\n]*\n|/\*.*?\*/)*(SELECT|SHOW)@i', $a_sql_query)) { + if ($i == $count - 1 && preg_match('@^((-- |#)[^\n]*\n|[\s]*\n|/\*.*?\*/)*(SELECT|SHOW)@i', $a_sql_query)) { $complete_query = $sql_query; $display_query = $sql_query; $sql_query = $a_sql_query;