From b2ee62d970cdcfbdc131230b9bbb58bab59add0f Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Thu, 15 Aug 2002 17:15:58 +0000
Subject: [PATCH] Backwards compatibility

---
 ChangeLog                        |  2 ++
 libraries/common.lib.php3        |  6 +++---
 libraries/config_import.lib.php3 | 16 +++++++++++++---
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 96f867ea9..0fb8bc12c 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,8 @@ $Source$
     * main.php3: Undefined variable.
     * lang/german-*.inc.php3: Fixed a typo, thanks to Steve Alberty (staybyte).
     * Documentation.html: XHTML fixes.
+    * libraries/common.lib.php3, libraries/config_import.lib.php3: Improved
+      backwards compatibility for old config files.
 
 2002-08-14 Olivier L. Müller  <om@omnis.ch>
     * Documentation.html, README, ANNOUNCE.txt, tbl_dump.php3:
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index cb23dffd4..56575d232 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -128,7 +128,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
      * Includes compatibility code for older config.inc.php3 revisions
      * if necessary
      */
-    if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 131) {
+    if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 137) {
         include('./libraries/config_import.lib.php3');
     }
 
@@ -1083,7 +1083,7 @@ if (typeof(document.getElementById) != 'undefined'
                 <?php
             } // end if
         } // end if... else if
-        
+
         // Checks if the table needs to be repaired after a TRUNCATE query.
         if (PMA_MYSQL_INT_VERSION >= 40000
             && $GLOBALS['sql_query'] == 'TRUNCATE TABLE ' . PMA_backquote($GLOBALS['table'])) {
@@ -1098,7 +1098,7 @@ if (typeof(document.getElementById) != 'undefined'
                 @PMA_mysql_query('REPAIR TABLE ' . PMA_backquote($GLOBALS['table']));
             }
         }
-        
+
         unset($tbl_status);
 
         echo "\n";
diff --git a/libraries/config_import.lib.php3 b/libraries/config_import.lib.php3
index 4400cf535..7f0221db4 100644
--- a/libraries/config_import.lib.php3
+++ b/libraries/config_import.lib.php3
@@ -373,14 +373,24 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')){
         $cfg['DefaultTabTable'] = 'tbl_properties_structure.php3';
     }
 
-    if (!isset($cfg['ManualBaseShort'])) {
+    if (!isset($cfg['ManualBase'])) {
         if (isset($cfgManualBaseShort)) {
-            $cfg['ManualBaseShort'] = $cfgManualBaseShort;
+            $cfg['ManualBase'] = $cfgManualBaseShort;
+            $cfg['MySQLManualType'] = 'old';
             unset($cfgManualBaseShort);
+        } else if (isset($cfg['ManualBaseShort'])) {
+            $cfg['ManualBase'] = $cfg['ManualBaseShort'];
+            $cfg['MySQLManualType'] = 'old';
+            unset($cfg['ManualBaseShort']);
         } else {
-            $cfg['ManualBaseShort'] = 'http://www.mysql.com/doc';
+            $cfg['ManualBase'] = 'http://www.mysql.com/doc/en';
+            $cfg['MySQLManualType'] = 'searchable';
         }
     }
+    
+    if (!isset($cfg['MySQLManualType'])) {
+        $cfg['MySQLManualType'] = 'none';
+    }
 
     if (!isset($cfg['DefaultLang'])) {
         if (isset($cfgDefaultLang)) {