nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PHP3 fix and bug #571409

Browse Source
This commit is contained in:
Loïc Chapeaux
2002-09-13 11:07:01 +00:00
parent a68db84064
commit ad976d1d8b
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -9,6 +9,9 @@ $Source$
* db_details.php3, line 121: XHTML fix. * db_details.php3, line 121: XHTML fix.
* tbl_properties_export.php3; libraries/build_dump.lib.php3; lang/*: * tbl_properties_export.php3; libraries/build_dump.lib.php3; lang/*:
feature #601603 (Field names on CSV export). 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 <lem9@users.sourceforge.net> 2002-09-12 Marc Delisle <lem9@users.sourceforge.net>
* libraries/display_tbl.lib.php3: bug 601809: when two fields have the * libraries/display_tbl.lib.php3: bug 601809: when two fields have the

2
libraries/relation.lib.php3
View File

@@ -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 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 db
* @global string the name of the current table * @global string the name of the current table
* @global array configuration infos about the relations stuff
* *
* @access public * @access public
* *
@@ -75,6 +76,7 @@ if (!defined('PMA_RELATION_LIB_INCLUDED')){
function PMA_getRelationsParam($verbose = FALSE) function PMA_getRelationsParam($verbose = FALSE)
{ {
global $cfg, $server, $err_url_0, $db, $table; global $cfg, $server, $err_url_0, $db, $table;
global $cfgRelation;
$cfgRelation = array(); $cfgRelation = array();
$cfgRelation['relwork'] = FALSE; $cfgRelation['relwork'] = FALSE;

8
main.php3
View File

@@ -5,8 +5,12 @@
/** /**
* Gets some core libraries and displays a top message if required * Gets some core libraries and displays a top message if required
*/ */
require('./libraries/grab_globals.lib.php3'); if (!defined('PMA_GRAB_GLOBALS_INCLUDED')) {
require('./libraries/common.lib.php3'); 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 // Puts the language to use in a cookie that will expire in 30 days
if (!isset($pma_uri_parts)) { if (!isset($pma_uri_parts)) {
$pma_uri_parts = parse_url($cfg['PmaAbsoluteUri']); $pma_uri_parts = parse_url($cfg['PmaAbsoluteUri']);