diff --git a/ChangeLog b/ChangeLog index d5d5220e8..2d1db7d86 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2002-07-01 Alexander M. Turek + * libraries/common.lib.php3, libraries/config_import.lib.php3: Backwards + compatibility for $cfg['PmaAbsoluteUri_DisableWarning']. + 2002-07-04 Robin Johnson * config.inc.php3, libraries/common.lib.php3: Code for $cfg['PmaAbsoluteUri_DisableWarning'] diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3 index 69ed78815..838a89474 100644 --- a/libraries/common.lib.php3 +++ b/libraries/common.lib.php3 @@ -136,7 +136,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold} include('./libraries/defines.lib.php3'); // For compatibility with old config.inc.php3 - if (!isset($cfg['FileRevision']) || (int)substr($cfg['FileRevision'],13,3) < 113) { + if (!isset($cfg['FileRevision']) || (int)substr($cfg['FileRevision'],13,3) < 116) { include('./libraries/config_import.lib.php3'); } @@ -504,7 +504,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold} // We display the warning by default, but not if it is disabled thru // via the $cfg['PmaAbsoluteUri_DisableWarning'] variable. - // This is intended for sysadmins that actually want the default behaviour + // This is intended for sysadmins that actually want the default behaviour // of auto-detection due to their setup. // See the mailing list message: // http://sourceforge.net/mailarchive/forum.php?thread_id=859093&forum_id=2141 diff --git a/libraries/config_import.lib.php3 b/libraries/config_import.lib.php3 index b1a6fcce3..b185c2d23 100644 --- a/libraries/config_import.lib.php3 +++ b/libraries/config_import.lib.php3 @@ -712,6 +712,10 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')){ ); } } + + if (!isset($cfg['PmaAbsoluteUri_DisableWarning'])) { + $cfg['PmaAbsoluteUri_DisableWarning'] = FALSE; + } } // $__PMA_CONFIG_IMPORT_LIB__ ?>