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

bug #890186

Browse Source
This commit is contained in:
Alexander M. Turek
2004-02-13 23:03:39 +00:00
parent 866653209d
commit 9abea89287
2 changed files with 7 additions and 3 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$
2004-02-13 Alexander M. Turek <resist@derrabus.de>
* libraries/common.lib.php: Fixed bug #890186 (PMA chokes on undefined
parser functions if one of the very first queries fails.
2004-02-11 Marc Delisle <lem9@users.sourceforge.net> 2004-02-11 Marc Delisle <lem9@users.sourceforge.net>
* server_privileges.php: bug 818654, password not copied * server_privileges.php: bug 818654, password not copied
* read_dump.php, libraries/display_tbl.lib.php, /bookmark.lib.php: * read_dump.php, libraries/display_tbl.lib.php, /bookmark.lib.php:

6
libraries/common.lib.php
View File

@@ -356,7 +356,7 @@ if ($is_minimum_common == FALSE) {
// Check that we actually have a valid set of parsed data // Check that we actually have a valid set of parsed data
// well, not quite // well, not quite
// first check for the SQL parser having hit an error // first check for the SQL parser having hit an error
if (PMA_SQP_isError()) { if (!defined('PMA_SQP_isError') || PMA_SQP_isError()) {
return $parsed_sql; return $parsed_sql;
} }
// then check for an array // then check for an array
@@ -467,7 +467,7 @@ if ($is_minimum_common == FALSE) {
// --- Added to solve bug #641765 // --- Added to solve bug #641765
// Robbat2 - 12 January 2003, 9:46PM // Robbat2 - 12 January 2003, 9:46PM
// Revised, Robbat2 - 13 Janurary 2003, 2:59PM // Revised, Robbat2 - 13 Janurary 2003, 2:59PM
if (PMA_SQP_isError()) { if (!defined('PMA_SQP_isError') || PMA_SQP_isError()) {
$parsed_sql = htmlspecialchars($the_query); $parsed_sql = htmlspecialchars($the_query);
} else { } else {
$parsed_sql = PMA_SQP_parse($the_query); $parsed_sql = PMA_SQP_parse($the_query);
@@ -482,7 +482,7 @@ if ($is_minimum_common == FALSE) {
// --- Added to solve bug #641765 // --- Added to solve bug #641765
// Robbat2 - 12 January 2003, 9:46PM // Robbat2 - 12 January 2003, 9:46PM
// Revised, Robbat2 - 13 Janurary 2003, 2:59PM // Revised, Robbat2 - 13 Janurary 2003, 2:59PM
if (PMA_SQP_isError()) { if (defined('PMA_SQP_isError') && PMA_SQP_isError()) {
echo PMA_SQP_getErrorString(); echo PMA_SQP_getErrorString();
} }
// --- // ---