From f36ffad8f1d85c8d7ae563243cdfe123fc8194cc Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Wed, 11 Sep 2002 17:06:45 +0000
Subject: [PATCH] XHTML fix

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

diff --git a/ChangeLog b/ChangeLog
index 128243178..90d92ccc7 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,10 +10,12 @@ $Source$
 
 2002-09-11 Michal Cihar  <nijel@users.sourceforge.net>
     * lang/czech-*.inc.php3: Updates.
-    
+
 2002-09-11 Alexander M. Turek  <rabus@users.sourceforge.net>
     * libraries/config_import.lib.php3: Another fix against bug #582890.
     * lang/german-*.inc.php3: Updates.
+    * libraries/sqlparser.lib.php3: XHTML fix (nl2br is not XHTML compilant
+      before PHP 4.0.5).
 
 2002-09-10: Robin Johnson  <robbat2@users.sourceforge.net>
     * libraries/common.lib.php3, main.php3:
diff --git a/libraries/sqlparser.lib.php3 b/libraries/sqlparser.lib.php3
index aa63339fd..378d39f8e 100644
--- a/libraries/sqlparser.lib.php3
+++ b/libraries/sqlparser.lib.php3
@@ -113,7 +113,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
         if (PMA_PHP_INT_VERSION >= 40001 && @function_exists('gzcompress')) {
             $encodedstr = gzcompress($debugstr, 9);
         }
-        $encodedstr     = nl2br(chunk_split(base64_encode($encodedstr)));
+        $encodedstr     = preg_replace("/(\015\012)|(\015)|(\012)/", '<br />' . "\n", chunk_split(base64_encode($encodedstr)));
 
         echo $GLOBALS['strSQLParserBugMessage'] . '<br />' . "\n"
              . '----' . $GLOBALS['strBeginCut'] . '----' . '<br />' . "\n"