diff --git a/ChangeLog b/ChangeLog index 53660c438..5d100793c 100755 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,8 @@ $Source$ 2002-04-24 Alexander M. Turek * libraries/*: $cfg system changes. + * libraries/common.lib.php3, libraries/select_lang.php3, + libraries/config_import.lib.php3: Config file backwards compatibility. 2002-04-24 Robin Johnson * *.php3 NOT tbl_*.php, Documentation.*: $cfg system changes. diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3 index a373d2f7e..6d3649f91 100644 --- a/libraries/common.lib.php3 +++ b/libraries/common.lib.php3 @@ -72,14 +72,8 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){ // For compatibility with old config.inc.php3 if (!isset($cfg)) { - if (empty($GLOBALS['is_header_sent'])) { - include('./header.inc.php3'); - } - echo '

Your config file version is not supported any longer!

' . "\n"; - include('./footer.inc.php3'); - exit(); + include('config_import.inc.php3'); } - // rabus: The new backwards compatibility code will follow soon... /** * Gets constants that defines the PHP, MySQL... releases. diff --git a/libraries/config_import.lib.php3 b/libraries/config_import.lib.php3 new file mode 100644 index 000000000..5e1a7953d --- /dev/null +++ b/libraries/config_import.lib.php3 @@ -0,0 +1,261 @@ + \ No newline at end of file diff --git a/libraries/select_lang.lib.php3 b/libraries/select_lang.lib.php3 index 7161d2f90..c73ea585e 100644 --- a/libraries/select_lang.lib.php3 +++ b/libraries/select_lang.lib.php3 @@ -163,6 +163,18 @@ if (!isset($lang)) { /** * Do the work! */ + +// compatibility with config.inc.php3 <= v1.80 +if (isset($cfgLang)) { + $cfg['Lang'] = $cfgLang; + unset($cfgLang); +} +if (isset($cfgDefaultLang)) { + $cfg['DefaultLang'] = $cfgDefaultLang; + unset($cfgLang); +} + + // Lang forced if (!empty($cfg['Lang'])) { $lang = $cfg['Lang'];