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
2003-07-07 12:33:01 +00:00
parent b190b5ba2e
commit 11a39a0bb9
3 changed files with 30 additions and 17 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$
2003-07-07 Alexander M. Turek <rabus@users.sourceforge.net>
* libraries/common.lib.php3, libraries/config_import.lib.php3: Backwards
compatibility.
2003-07-07 Garvin Hicking <me@supergarv.de> 2003-07-07 Garvin Hicking <me@supergarv.de>
* tbl_change.php3: Fix undefined index for disp_query * tbl_change.php3: Fix undefined index for disp_query
(when inserting a new row with a file uploaded to a column) (when inserting a new row with a file uploaded to a column)

2
libraries/common.lib.php3
View File

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

29
libraries/config_import.lib.php3
View File

@@ -56,6 +56,19 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
} }
} }
if (!isset($cfg['PmaAbsoluteUri_DisableWarning'])) {
$cfg['PmaAbsoluteUri_DisableWarning'] = FALSE;
}
if (!isset($cfg['PmaNoRelation_DisableWarning'])) {
$cfg['PmaNoRelation_DisableWarning'] = FALSE;
}
// do not set a default value here!
if (!isset($cfg['blowfish_secret'])) {
$cfg['blowfish_secret'] = '';
}
if (!isset($cfg['Servers'])) { if (!isset($cfg['Servers'])) {
if (isset($cfgServers)) { if (isset($cfgServers)) {
$cfg['Servers'] = $cfgServers; $cfg['Servers'] = $cfgServers;
@@ -98,10 +111,12 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
unset($cfg['Servers'][$i]['adv_auth']); unset($cfg['Servers'][$i]['adv_auth']);
} }
// do not put a default value here, we want to output an error to force // for users who use the "first" blowfish mechanism
// the installer to enter his own secret if (isset($cfg['Servers'][$i]['blowfish_secret'])) {
if (!isset($cfg['Servers'][$i]['blowfish_secret'])) { if (empty($cfg['blowfish_secret'])) {
$cfg['Servers'][$i]['blowfish_secret'] = ''; $cfg['blowfish_secret'] = $cfg['Servers'][$i]['blowfish_secret'];
}
unset($cfg['Servers'][$i]['blowfish_secret']);
} }
if (!isset($cfg['Servers'][$i]['compress'])) { if (!isset($cfg['Servers'][$i]['compress'])) {
@@ -1071,12 +1086,6 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
); );
} }
if (!isset($cfg['PmaAbsoluteUri_DisableWarning'])) {
$cfg['PmaAbsoluteUri_DisableWarning'] = FALSE;
}
if (!isset($cfg['PmaNoRelation_DisableWarning'])) {
$cfg['PmaNoRelation_DisableWarning'] = FALSE;
}
if (!isset($cfg['GD2Available'])) { if (!isset($cfg['GD2Available'])) {
$cfg['GD2Available'] = 'auto'; $cfg['GD2Available'] = 'auto';
} }