libraries/common.lib.php3: a single $cfgServer instance was forgotten

This commit is contained in:
Robin Johnson
2002-04-25 02:01:23 +00:00
parent 177c414ba6
commit 109fbf3126
2 changed files with 3 additions and 2 deletions

View File

@@ -20,6 +20,7 @@ $Source$
* scripts/*: Updated comments somewhat * scripts/*: Updated comments somewhat
* tbl_dump.php3:121: renamed $cfgServer_backup to $backup_cfgServer * tbl_dump.php3:121: renamed $cfgServer_backup to $backup_cfgServer
* user_details.php3: forgot to change $GLOBALS['cfgXYZ'] to $GLOBALS['cfg']['XYZ'] * user_details.php3: forgot to change $GLOBALS['cfgXYZ'] to $GLOBALS['cfg']['XYZ']
* libraries/common.lib.php3: a single $cfgServer instance was forgotten
2002-04-23 Marc Delisle <lem9@users.sourceforge.net> 2002-04-23 Marc Delisle <lem9@users.sourceforge.net>
* tbl_printview.php3, lang/*.php3: Relation links in printview, * tbl_printview.php3, lang/*.php3: Relation links in printview,

View File

@@ -88,7 +88,7 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
// output buffering should be run // output buffering should be run
if (PMA_PHP_INT_VERSION < 40000 if (PMA_PHP_INT_VERSION < 40000
|| (PMA_PHP_INT_VERSION >= 40005 && @ini_get('zlib.output_compression'))) { || (PMA_PHP_INT_VERSION >= 40005 && @ini_get('zlib.output_compression'))) {
$cfgOBGzip = FALSE; $cfg['OBGzip'] = FALSE;
} }
@@ -361,7 +361,7 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
* Otherwise, set up $cfg['Server'] and do the usual login stuff. * Otherwise, set up $cfg['Server'] and do the usual login stuff.
*/ */
else if (isset($cfg['Servers'][$server])) { else if (isset($cfg['Servers'][$server])) {
$cfgServer = $cfg['Servers'][$server]; $cfg['Server'] = $cfg['Servers'][$server];
// Check how the config says to connect to the server // Check how the config says to connect to the server
$server_port = (empty($cfg['Server']['port'])) $server_port = (empty($cfg['Server']['port']))