From 11b4950345ba3be88823b521f51d909ab0eaccd2 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Fri, 23 Aug 2002 10:22:54 +0000 Subject: [PATCH] =?UTF-8?q?For=20Lo=EF=BF=BDc:=20bug=20#571409?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChangeLog | 3 +++ db_details_common.php3 | 12 +++++++++--- libraries/sqlparser.lib.php3 | 8 ++++++-- tbl_properties_common.php3 | 12 +++++++++--- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67e11c783..53f3e8d92 100755 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,9 @@ $Source$ 2002-08-23 Loïc Chapeaux * left.php3, lines 169-181: XHTML optimizations. + * db_details_common.php3, tbl_properties_common.php3, + libraries/sqlparser.lib.php3: Fixed bug #571409 (it doesn't work properly + with Zend Accelerator). 2002-08-23 Alexander M. Turek * libraries/charset_conversion.lib.php3: Don't let php display an error diff --git a/db_details_common.php3 b/db_details_common.php3 index 385f1a442..541b2cf67 100644 --- a/db_details_common.php3 +++ b/db_details_common.php3 @@ -5,9 +5,15 @@ /** * Gets some core libraries */ -require('./libraries/grab_globals.lib.php3'); -require('./libraries/common.lib.php3'); -require('./libraries/bookmark.lib.php3'); +if (!defined('PMA_GRAB_GLOBALS_INCLUDED')) { + include('./libraries/grab_globals.lib.php3'); +} +if (!defined('PMA_COMMON_LIB_INCLUDED')) { + include('./libraries/common.lib.php3'); +} +if (!defined('PMA_BOOKMARK_LIB_INCLUDED')) { + include('./libraries/bookmark.lib.php3'); +} /** diff --git a/libraries/sqlparser.lib.php3 b/libraries/sqlparser.lib.php3 index 3a64199b8..aa63339fd 100644 --- a/libraries/sqlparser.lib.php3 +++ b/libraries/sqlparser.lib.php3 @@ -35,12 +35,16 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) { /** * Include the string library as we use it heavily */ - include('./libraries/string.lib.php3'); + if (!defined('PMA_STR_LIB_INCLUDED')) { + include('./libraries/string.lib.php3'); + } /** * Include data for the SQL Parser */ - include('./libraries/sqlparser.data.php3'); + if (!defined('PMA_SQP_DATA_INCLUDED')) { + include('./libraries/sqlparser.data.php3'); + } if (!defined('DEBUG_TIMING')) { function PMA_SQP_arrayAdd(&$arr, $type, $data, &$arrsize) diff --git a/tbl_properties_common.php3 b/tbl_properties_common.php3 index 24add7da8..d3c743b7e 100755 --- a/tbl_properties_common.php3 +++ b/tbl_properties_common.php3 @@ -5,9 +5,15 @@ /** * Gets some core libraries */ -require('./libraries/grab_globals.lib.php3'); -require('./libraries/common.lib.php3'); -require('./libraries/bookmark.lib.php3'); +if (!defined('PMA_GRAB_GLOBALS_INCLUDED')) { + include('./libraries/grab_globals.lib.php3'); +} +if (!defined('PMA_COMMON_LIB_INCLUDED')) { + include('./libraries/common.lib.php3'); +} +if (!defined('PMA_BOOKMARK_LIB_INCLUDED')) { + include('./libraries/bookmark.lib.php3'); +} /**