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

Backwards compatibility for config files < rev. 1.113

Browse Source
This commit is contained in:
Alexander M. Turek
2002-06-29 10:57:47 +00:00
parent 210988e253
commit 91e6239adc
3 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2002-06-29 Alexander M. Turek <rabus@users.sourceforge.net>
* libraries/config_import.lib.php3, libraries/common.lib.php3:
Backwards compatibility for config files < rev. 1.113.
2002-06-29 Olivier L. M<>ller <om@omnis.ch> 2002-06-29 Olivier L. M<>ller <om@omnis.ch>
* Documentation.html: docs about $cfg['DefaultTabDatabase'] * Documentation.html: docs about $cfg['DefaultTabDatabase']
and $cfg['DefaultTabTable'] and $cfg['DefaultTabTable']

2
libraries/common.lib.php3
View File

@@ -136,7 +136,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
include('./libraries/defines.lib.php3'); include('./libraries/defines.lib.php3');
// For compatibility with old config.inc.php3 // For compatibility with old config.inc.php3
if (!isset($cfg['FileRevision']) || (int)substr($cfg['FileRevision'],13,3) < 110) { if (!isset($cfg['FileRevision']) || (int)substr($cfg['FileRevision'],13,3) < 113) {
include('./libraries/config_import.lib.php3'); include('./libraries/config_import.lib.php3');
} }

16
libraries/config_import.lib.php3
View File

@@ -262,6 +262,10 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')){
} }
} }
if (!isset($cfg['SuggestDBName'])) {
$cfg['SuggestDBName'] = TRUE;
}
if (!isset($cfg['ShowBlob'])) { if (!isset($cfg['ShowBlob'])) {
if (isset($cfgShowBlob)) { if (isset($cfgShowBlob)) {
$cfg['ShowBlob'] = $cfgShowBlob; $cfg['ShowBlob'] = $cfgShowBlob;
@@ -358,6 +362,18 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')){
} }
} }
if (!isset($cfg['DefaultTabDatabase'])
// rabus: config.inc.php3 rev. 1.112 had this default value.
|| $cfg['DefaultTabDatabase'] == 'Structure') {
$cfg['DefaultTabDatabase'] = 'db_details_structure.php3';
}
if (!isset($cfg['DefaultTabTable'])
// rabus: config.inc.php3 rev. 1.112 had this default value.
|| $cfg['DefaultTabTable'] == 'Structure') {
$cfg['DefaultTabTable'] = 'tbl_properties_structure.php3';
}
if (!isset($cfg['ManualBaseShort'])) { if (!isset($cfg['ManualBaseShort'])) {
if (isset($cfgManualBaseShort)) { if (isset($cfgManualBaseShort)) {
$cfg['ManualBaseShort'] = $cfgManualBaseShort; $cfg['ManualBaseShort'] = $cfgManualBaseShort;