Work with $display_query only if set (Marc spotted this out).
This commit is contained in:
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
|
||||
$Id$
|
||||
$Source$
|
||||
|
||||
2004-08-17 Michal Čihař <michal@cihar.com>
|
||||
* sql.php: Work with $display_query only if set (Marc spotted this out).
|
||||
|
||||
2004-08-17 Marc Delisle <lem9@users.sourceforge.net>
|
||||
* tbl_select.php, config.inc.php, libraries/config_import.lib.php,
|
||||
libraries/common.lib.php: move search operators to config file,
|
||||
|
10
sql.php
10
sql.php
@@ -319,10 +319,12 @@ else {
|
||||
} else {
|
||||
$full_sql_query = $sql_query . $sql_limit_to_append;
|
||||
}
|
||||
if (preg_match('@((.|\n)*)(([[:space:]](PROCEDURE[[:space:]](.*)|FOR[[:space:]]+UPDATE|LOCK[[:space:]]+IN[[:space:]]+SHARE[[:space:]]+MODE))|;)[[:space:]]*$@i', $display_query, $regs)) {
|
||||
$display_query = $regs[1] . $sql_limit_to_append . $regs[3];
|
||||
} else {
|
||||
$display_query = $display_query . $sql_limit_to_append;
|
||||
if (isset($display_query)) {
|
||||
if (preg_match('@((.|\n)*)(([[:space:]](PROCEDURE[[:space:]](.*)|FOR[[:space:]]+UPDATE|LOCK[[:space:]]+IN[[:space:]]+SHARE[[:space:]]+MODE))|;)[[:space:]]*$@i', $display_query, $regs)) {
|
||||
$display_query = $regs[1] . $sql_limit_to_append . $regs[3];
|
||||
} else {
|
||||
$display_query = $display_query . $sql_limit_to_append;
|
||||
}
|
||||
}
|
||||
unset($sql_limit_to_append);
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user