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-09-21 06:43:10 +00:00
parent ca822a5333
commit 01264ae3b5
3 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -7,6 +7,8 @@ $Source$
2002-09-21 Alexander M. Turek <rabus@users.sourceforge.net> 2002-09-21 Alexander M. Turek <rabus@users.sourceforge.net>
* lang/german-*.inc.php3: Updates. * lang/german-*.inc.php3: Updates.
* libraries/common.lib.php3, libraries/config_import.lib.php3: Backwards
compatibility for config.inc.php3 < rev 1.144.
2002-09-20 Marc Delisle <lem9@users.sourceforge.net> 2002-09-20 Marc Delisle <lem9@users.sourceforge.net>
* libraries/display_tbl.lib.php3: bug 612117, vertical view and * libraries/display_tbl.lib.php3: bug 612117, vertical view and

2
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) < 141) { if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 144) {
include('./libraries/config_import.lib.php3'); include('./libraries/config_import.lib.php3');
} }

18
libraries/config_import.lib.php3
View File

@@ -338,6 +338,10 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')){
} }
} }
if (!isset($cfg['CharEditing'])) {
$cfg['CharEditing'] = 'input';
}
if (!isset($cfg['ZipDump'])) { if (!isset($cfg['ZipDump'])) {
if (isset($cfgZipDump)) { if (isset($cfgZipDump)) {
$cfg['ZipDump'] = $cfgZipDump; $cfg['ZipDump'] = $cfgZipDump;
@@ -545,21 +549,11 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')){
} }
if (!isset($cfg['CharTextareaCols'])) { if (!isset($cfg['CharTextareaCols'])) {
if (isset($cfgCharTextareaCols)) { $cfg['CharTextareaCols'] = 40;
$cfg['CharTextareaCols'] = $cfgCharTextareaCols;
unset($cfgCharTextareaCols);
} else {
$cfg['CharTextareaCols'] = 40;
}
} }
if (!isset($cfg['CharTextareaRows'])) { if (!isset($cfg['CharTextareaRows'])) {
if (isset($cfgCharTextareaRows)) { $cfg['CharTextareaRows'] = 2;
$cfg['CharTextareaRows'] = $cfgCharTextareaRows;
unset($cfgCharTextareaRows);
} else {
$cfg['CharTextareaRows'] = 2;
}
} }
if (!isset($cfg['LimitChars'])) { if (!isset($cfg['LimitChars'])) {