From 85e43e362fb06e5d5ee5f1c61724685c90ddb396 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Mon, 15 Jul 2002 21:07:35 +0000
Subject: [PATCH] Better fix against bug #571409

---
 ChangeLog       | 3 ++-
 header.inc.php3 | 7 +++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a86eb12a7..6761b1711 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ $Source$
     * libraries/config_import.lib.php3:
       - Removed a comment and
       - Changed the default value for $cfg['AllowAnywhereRecoding'] into FALSE.
+    * header.inc.php3: Better fix against bug #571409, thanks to Loïc.
 
 2002-07-15 Marc Delisle  <lem9@users.sourceforge.net>
     * db_details_export.php3, db_details_links.php3, Documentation.html,
@@ -20,7 +21,7 @@ $Source$
     * libraries/charset_conversion.lib.php3: remove the "@" before dl()
       because multithreaded servers don't support dl(), and we want
       to see the error message, thanks to /Leblanc
-    * header.inc.php3: js error with OmniWeb, thanks to Loic
+    * header.inc.php3: js error with OmniWeb, thanks to Loïc
 
 2002-07-14 Marc Delisle  <lem9@users.sourceforge.net>
     * Documentation.html, db_details_exports.php3, tbl_properties_export.php3:
diff --git a/header.inc.php3 b/header.inc.php3
index f16f3bb50..acbe7adda 100755
--- a/header.inc.php3
+++ b/header.inc.php3
@@ -5,11 +5,10 @@
 /**
  * Gets a core script and starts output buffering work
  */
-if (function_exists('require_once')) {
-    require_once('./libraries/common.lib.php3');
-    require_once('./libraries/ob.lib.php3');
-} else {
+if (!defined('PMA_COMMON_LIB_INCLUDED')) {
     require('./libraries/common.lib.php3');
+}
+if (!defined('PMA_OB_LIB_INCLUDED')) {
     require('./libraries/ob.lib.php3');
 }
 if ($GLOBALS['cfg']['OBGzip']) {