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

Fix detection of SELECT query to display on multiple submits (bug #1110727).

Browse Source
This commit is contained in:
Michal Čihař
2005-01-27 14:49:29 +00:00
parent 57cd536b8e
commit 3b94630984
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$ $Id$
$Source$ $Source$
2005-01-27 Michal Čihař <michal@cihar.com>
* read_dump.php: Fix detection of SELECT query to display on multiple
submits (bug #1110727).
2005-01-23 Marc Delisle <lem9@users.sourceforge.net> 2005-01-23 Marc Delisle <lem9@users.sourceforge.net>
* tbl_query_box.php: bug #1107937, undefined $fields_list * tbl_query_box.php: bug #1107937, undefined $fields_list
* lang/estonian: Update thanks to Alvar Soome - finsoft. * lang/estonian: Update thanks to Alvar Soome - finsoft.

2
read_dump.php
View File

@@ -275,7 +275,7 @@ if ($sql_query != '') {
// .*? below is non greedy expansion, just in case somebody wants to understand it... // .*? below is non greedy expansion, just in case somebody wants to understand it...
// looks ok here without using PCRE_MULTILINE // 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; $complete_query = $sql_query;
$display_query = $sql_query; $display_query = $sql_query;
$sql_query = $a_sql_query; $sql_query = $a_sql_query;