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

Backwards compatibility

Browse Source
This commit is contained in:
Alexander M. Turek
2002-08-15 17:15:58 +00:00
parent 200905a1eb
commit b2ee62d970
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -18,6 +18,8 @@ $Source$
* main.php3: Undefined variable. * main.php3: Undefined variable.
* lang/german-*.inc.php3: Fixed a typo, thanks to Steve Alberty (staybyte). * lang/german-*.inc.php3: Fixed a typo, thanks to Steve Alberty (staybyte).
* Documentation.html: XHTML fixes. * Documentation.html: XHTML fixes.
* libraries/common.lib.php3, libraries/config_import.lib.php3: Improved
backwards compatibility for old config files.
2002-08-14 Olivier L. M<>ller <om@omnis.ch> 2002-08-14 Olivier L. M<>ller <om@omnis.ch>
* Documentation.html, README, ANNOUNCE.txt, tbl_dump.php3: * Documentation.html, README, ANNOUNCE.txt, tbl_dump.php3:

6
libraries/common.lib.php3
View File

@@ -128,7 +128,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
* Includes compatibility code for older config.inc.php3 revisions * Includes compatibility code for older config.inc.php3 revisions
* if necessary * if necessary
*/ */
if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 131) { if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 137) {
include('./libraries/config_import.lib.php3'); include('./libraries/config_import.lib.php3');
} }
@@ -1083,7 +1083,7 @@ if (typeof(document.getElementById) != 'undefined'
<?php <?php
} // end if } // end if
} // end if... else if } // end if... else if
// Checks if the table needs to be repaired after a TRUNCATE query. // Checks if the table needs to be repaired after a TRUNCATE query.
if (PMA_MYSQL_INT_VERSION >= 40000 if (PMA_MYSQL_INT_VERSION >= 40000
&& $GLOBALS['sql_query'] == 'TRUNCATE TABLE ' . PMA_backquote($GLOBALS['table'])) { && $GLOBALS['sql_query'] == 'TRUNCATE TABLE ' . PMA_backquote($GLOBALS['table'])) {
@@ -1098,7 +1098,7 @@ if (typeof(document.getElementById) != 'undefined'
@PMA_mysql_query('REPAIR TABLE ' . PMA_backquote($GLOBALS['table'])); @PMA_mysql_query('REPAIR TABLE ' . PMA_backquote($GLOBALS['table']));
} }
} }
unset($tbl_status); unset($tbl_status);
echo "\n"; echo "\n";

16
libraries/config_import.lib.php3
View File

@@ -373,14 +373,24 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')){
$cfg['DefaultTabTable'] = 'tbl_properties_structure.php3'; $cfg['DefaultTabTable'] = 'tbl_properties_structure.php3';
} }
if (!isset($cfg['ManualBaseShort'])) { if (!isset($cfg['ManualBase'])) {
if (isset($cfgManualBaseShort)) { if (isset($cfgManualBaseShort)) {
$cfg['ManualBaseShort'] = $cfgManualBaseShort; $cfg['ManualBase'] = $cfgManualBaseShort;
$cfg['MySQLManualType'] = 'old';
unset($cfgManualBaseShort); unset($cfgManualBaseShort);
} else if (isset($cfg['ManualBaseShort'])) {
$cfg['ManualBase'] = $cfg['ManualBaseShort'];
$cfg['MySQLManualType'] = 'old';
unset($cfg['ManualBaseShort']);
} else { } else {
$cfg['ManualBaseShort'] = 'http://www.mysql.com/doc'; $cfg['ManualBase'] = 'http://www.mysql.com/doc/en';
$cfg['MySQLManualType'] = 'searchable';
} }
} }
if (!isset($cfg['MySQLManualType'])) {
$cfg['MySQLManualType'] = 'none';
}
if (!isset($cfg['DefaultLang'])) { if (!isset($cfg['DefaultLang'])) {
if (isset($cfgDefaultLang)) { if (isset($cfgDefaultLang)) {