Fixed bad displaying of parser bug report (bug #678289).

This commit is contained in:
Michal Čihař
2003-06-06 13:27:35 +00:00
parent 86f067a803
commit f9b4b35c2e
2 changed files with 5 additions and 11 deletions

View File

@@ -18,6 +18,8 @@ $Source$
db_details_structure.php3, pdf_pages.php3, pdf_schema.php3: User can db_details_structure.php3, pdf_pages.php3, pdf_schema.php3: User can
select paper size for pdf (RFE #631551). select paper size for pdf (RFE #631551).
* read_dump.php3: Fixed undefined variable warning (bug #750070). * read_dump.php3: Fixed undefined variable warning (bug #750070).
* libraries/sqlparser.lib.php3: Fixed bad displaying of parser bug report
(bug #678289).
2003-06-05 Marc Delisle <lem9@users.sourceforge.net> 2003-06-05 Marc Delisle <lem9@users.sourceforge.net>
* Documentation.html: new faq 6.20 about CREATE TEMPORARY TABLES * Documentation.html: new faq 6.20 about CREATE TEMPORARY TABLES

View File

@@ -154,6 +154,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
*/ */
function PMA_SQP_bug($message, $sql) function PMA_SQP_bug($message, $sql)
{ {
global $SQP_errorString;
$debugstr = 'ERROR: ' . $message . "\n"; $debugstr = 'ERROR: ' . $message . "\n";
$debugstr .= 'CVS: $Id$' . "\n"; $debugstr .= 'CVS: $Id$' . "\n";
$debugstr .= 'MySQL: '.PMA_MYSQL_STR_VERSION . "\n"; $debugstr .= 'MySQL: '.PMA_MYSQL_STR_VERSION . "\n";
@@ -169,26 +170,17 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
} }
$encodedstr = preg_replace("/(\015\012)|(\015)|(\012)/", '<br />' . "\n", chunk_split(base64_encode($encodedstr))); $encodedstr = preg_replace("/(\015\012)|(\015)|(\012)/", '<br />' . "\n", chunk_split(base64_encode($encodedstr)));
echo $GLOBALS['strSQLParserBugMessage'] . '<br />' . "\n" $SQP_errorString .= $GLOBALS['strSQLParserBugMessage'] . '<br />' . "\n"
. '----' . $GLOBALS['strBeginCut'] . '----' . '<br />' . "\n" . '----' . $GLOBALS['strBeginCut'] . '----' . '<br />' . "\n"
. $encodedstr . "\n" . $encodedstr . "\n"
. '----' . $GLOBALS['strEndCut'] . '----' . '<br />' . "\n"; . '----' . $GLOBALS['strEndCut'] . '----' . '<br />' . "\n";
flush(); $SQP_errorString .= '----' . $GLOBALS['strBeginRaw'] . '----<br />' . "\n"
if (PMA_PHP_INT_VERSION >= 40200 && @function_exists('ob_flush')) {
ob_flush();
}
echo '----' . $GLOBALS['strBeginRaw'] . '----<br />' . "\n"
. '<pre>' . "\n" . '<pre>' . "\n"
. $debugstr . $debugstr
. '</pre>' . "\n" . '</pre>' . "\n"
. '----' . $GLOBALS['strEndRaw'] . '----<br />' . "\n"; . '----' . $GLOBALS['strEndRaw'] . '----<br />' . "\n";
flush();
if (PMA_PHP_INT_VERSION >= 40200 && @function_exists('ob_flush')) {
ob_flush();
}
} // end of the "PMA_SQP_bug()" function } // end of the "PMA_SQP_bug()" function