From ad976d1d8bcd7f1b1efe8ec9020e1b22773b27ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Chapeaux?= Date: Fri, 13 Sep 2002 11:07:01 +0000 Subject: [PATCH] PHP3 fix and bug #571409 --- ChangeLog | 3 +++ libraries/relation.lib.php3 | 2 ++ main.php3 | 8 ++++++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d5044a3d8..5ec4cad41 100755 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,9 @@ $Source$ * db_details.php3, line 121: XHTML fix. * tbl_properties_export.php3; libraries/build_dump.lib.php3; lang/*: feature #601603 (Field names on CSV export). + * main.php3, lines 11-13: new fix against bug #571409 (it doesn't work + properly with Zend Accelerator). + * libraries/relation.lib.php3, lines 70 & 79: PHP3 fix. 2002-09-12 Marc Delisle * libraries/display_tbl.lib.php3: bug 601809: when two fields have the diff --git a/libraries/relation.lib.php3 b/libraries/relation.lib.php3 index 9cf134bee..03a743072 100644 --- a/libraries/relation.lib.php3 +++ b/libraries/relation.lib.php3 @@ -67,6 +67,7 @@ if (!defined('PMA_RELATION_LIB_INCLUDED')){ * @global string the URL of the page to show in case of error * @global string the name of the current db * @global string the name of the current table + * @global array configuration infos about the relations stuff * * @access public * @@ -75,6 +76,7 @@ if (!defined('PMA_RELATION_LIB_INCLUDED')){ function PMA_getRelationsParam($verbose = FALSE) { global $cfg, $server, $err_url_0, $db, $table; + global $cfgRelation; $cfgRelation = array(); $cfgRelation['relwork'] = FALSE; diff --git a/main.php3 b/main.php3 index ec77277f5..0049c9b5d 100755 --- a/main.php3 +++ b/main.php3 @@ -5,8 +5,12 @@ /** * Gets some core libraries and displays a top message if required */ -require('./libraries/grab_globals.lib.php3'); -require('./libraries/common.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'); +} // Puts the language to use in a cookie that will expire in 30 days if (!isset($pma_uri_parts)) { $pma_uri_parts = parse_url($cfg['PmaAbsoluteUri']);