From f9b4b35c2e857cc2dbbf261d574e37f5b7cb7592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 6 Jun 2003 13:27:35 +0000
Subject: [PATCH] Fixed bad displaying of parser bug report (bug #678289).

---
 ChangeLog                    |  2 ++
 libraries/sqlparser.lib.php3 | 14 +++-----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 59cf773ad..601960457 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,8 @@ $Source$
       db_details_structure.php3, pdf_pages.php3, pdf_schema.php3: User can
       select paper size for pdf (RFE #631551).
     * 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>
     * Documentation.html: new faq 6.20 about CREATE TEMPORARY TABLES
diff --git a/libraries/sqlparser.lib.php3 b/libraries/sqlparser.lib.php3
index d4042bb37..1c398498d 100644
--- a/libraries/sqlparser.lib.php3
+++ b/libraries/sqlparser.lib.php3
@@ -154,6 +154,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
          */
         function PMA_SQP_bug($message, $sql)
         {
+            global $SQP_errorString;
             $debugstr = 'ERROR: ' . $message . "\n";
             $debugstr .= 'CVS: $Id$' . "\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)));
 
-            echo $GLOBALS['strSQLParserBugMessage'] . '<br />' . "\n"
+            $SQP_errorString .= $GLOBALS['strSQLParserBugMessage'] . '<br />' . "\n"
                  . '----' . $GLOBALS['strBeginCut'] . '----' . '<br />' . "\n"
                  . $encodedstr . "\n"
                  . '----' . $GLOBALS['strEndCut'] . '----' . '<br />' . "\n";
 
-            flush();
-            if (PMA_PHP_INT_VERSION >= 40200 && @function_exists('ob_flush')) {
-                ob_flush();
-            }
-
-            echo '----' . $GLOBALS['strBeginRaw'] . '----<br />' . "\n"
+            $SQP_errorString .= '----' . $GLOBALS['strBeginRaw'] . '----<br />' . "\n"
                  . '<pre>' . "\n"
                  . $debugstr
                  . '</pre>' . "\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