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

ChangeLog read_dump.php3 sql.php3 libraries/common.lib.php3 libraries/sqlparser.lib.php3: Fixed bug #641765, see mailing list post

Browse Source
This commit is contained in:
Robin Johnson
2003-01-13 06:59:45 +00:00
parent 6d14f56346
commit a66c941f35
5 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libraries/common.lib.php3
View File

@@ -323,6 +323,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
$is_modify_link = TRUE, $back_url = '')
{
global $cfg;
global $SQP_errorString;
if (empty($GLOBALS['is_header_sent'])) {
include('./header.inc.php3');
@@ -335,13 +336,27 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
$the_query = $GLOBALS['sql_query'];
}
$parsed_sql = PMA_SQP_parse($the_query);
// --- Added to solve bug #641765
// Robbat2 - 12 January 2003, 9:46PM
if (isset($SQP_errorString) && !empty($SQP_errorString)) {
$parsed_sql = $the_query;
} else {
$parsed_sql = PMA_SQP_parse($the_query);
}
// ---
echo '<p><b>'. $GLOBALS['strError'] . '</b></p>' . "\n";
// if the config password is wrong, or the MySQL server does not
// respond, do not show the query that would reveal the
// username/password
if (!empty($the_query) && !strstr($the_query, 'connect')) {
// --- Added to solve bug #641765
// Robbat2 - 12 January 2003, 9:46PM
if (isset($SQP_errorString) && !empty($SQP_errorString)) {
flush();
echo $SQP_errorString;
}
// ---
echo '<p>' . "\n";
echo ' ' . $GLOBALS['strSQLQuery'] . '&nbsp;:&nbsp;' . "\n";
if ($is_modify_link && isset($db)) {
@@ -364,6 +379,8 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
echo '<pre>' . "\n"
. $error_message . "\n"
. '</pre>' . "\n";
if (!empty($back_url)) {
echo '<a href="' . $back_url . '">' . $GLOBALS['strBack'] . '</a>';
}