diff --git a/ChangeLog b/ChangeLog index 60ce94c97..9c9c2e94a 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2003-06-03 Michal Cihar + * libraries/config_import.lib.php3: Fixed MySQLManualType/MySQLManualBase + setting. + 2003-06-03 Garvin Hicking * lang/*, tbl_query_box.php3, Documentation.html, footer.inc.php3: (Experimental) @@ -359,4 +363,4 @@ $Source$ * Added scripts/inno2pma (from Ernie Hershey). Please see Patch Tracker #709383 for further information. * libraries/display_tbl.lib.php3: Bug #728813 (title for - r \ No newline at end of file + r diff --git a/libraries/config_import.lib.php3 b/libraries/config_import.lib.php3 index ee67051a4..768a97a7e 100644 --- a/libraries/config_import.lib.php3 +++ b/libraries/config_import.lib.php3 @@ -454,17 +454,17 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) { $cfg['DefaultTabTable'] = 'tbl_properties_structure.php3'; } - if (!isset($cfg['ManualBase'])) { + if (!isset($cfg['MySQLManualBase'])) { if (isset($cfgManualBaseShort)) { - $cfg['ManualBase'] = $cfgManualBaseShort; + $cfg['MySQLManualBase'] = $cfgManualBaseShort; $cfg['MySQLManualType'] = 'old'; unset($cfgManualBaseShort); } else if (isset($cfg['ManualBaseShort'])) { - $cfg['ManualBase'] = $cfg['ManualBaseShort']; + $cfg['MySQLManualBase'] = $cfg['ManualBaseShort']; $cfg['MySQLManualType'] = 'old'; unset($cfg['ManualBaseShort']); } else { - $cfg['ManualBase'] = 'http://www.mysql.com/doc/en'; + $cfg['MySQLManualBase'] = 'http://www.mysql.com/doc/en'; $cfg['MySQLManualType'] = 'searchable'; } }