From 91e6239adcd0269254d9ad4e89e803f8fd254472 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Sat, 29 Jun 2002 10:57:47 +0000
Subject: [PATCH] Backwards compatibility for config files < rev. 1.113

---
 ChangeLog                        | 10 +++++++---
 libraries/common.lib.php3        |  8 ++++----
 libraries/config_import.lib.php3 | 16 ++++++++++++++++
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1935d798e..ec1272d7d 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,22 +5,26 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-06-29 Alexander M. Turek  <rabus@users.sourceforge.net>
+    * libraries/config_import.lib.php3, libraries/common.lib.php3:
+      Backwards compatibility for config files < rev. 1.113.
+
 2002-06-29 Olivier L. Müller  <om@omnis.ch>
     * Documentation.html: docs about $cfg['DefaultTabDatabase']
       and $cfg['DefaultTabTable']
     * config.inc.php3, index.php3, left.php3, libraries/common.lib.php3:
-      default tab selection is now customizable from config.inc.php3. 
+      default tab selection is now customizable from config.inc.php3.
 
 2002-06-28 Olivier L. Müller  <om@omnis.ch>
     * ANNOUNCE.txt: preparing 2.3.0 announcement... Feel free
       to improve and check
 
 2002-06-28 Marc Delisle  <lem9@users.sourceforge.net>
-    * tbl_change.php3, tbl_properties_common.php3, 
+    * tbl_change.php3, tbl_properties_common.php3,
       new libraries/db_table_exists.lib.php3: menu on insert/edit
 
 2002-06-27 Marc Delisle  <lem9@users.sourceforge.net>
-    * sql.php3, db_details_db_info.php3, db_details_links.php3: bug with a 
+    * sql.php3, db_details_db_info.php3, db_details_links.php3: bug with a
       Select and no table
     * lang/slovak-iso updates, thanks to Lubos Klokner
     * Documentation.html: faq about silent column type changing
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index 95735a68c..899e1f197 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) < 110) {
+    if (!isset($cfg['FileRevision']) || (int)substr($cfg['FileRevision'],13,3) < 113) {
         include('./libraries/config_import.lib.php3');
     }
 
@@ -495,8 +495,8 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
     if (empty($cfg['PmaAbsoluteUri'])) {
 
         $DisplayPmaAbsoluteUriWarning = 1;
-        
-        // Setup a default value to let the people and lazy syadmins work anyway, 
+
+        // Setup a default value to let the people and lazy syadmins work anyway,
         // but display a big warning on the main.php3 page.  --Olivier
 
         $cfg['PmaAbsoluteUri'] = (!empty($HTTP_SERVER_VARS['HTTPS']) ? 'https' : 'http') . '://'
@@ -513,7 +513,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
 
 
     /**
-     * Make sure $cfg['DefaultTabDatabase'] and $cfg['DefaultTabTable'] are set. 
+     * Make sure $cfg['DefaultTabDatabase'] and $cfg['DefaultTabTable'] are set.
      * Todo: check if it is set to a *valid* value.
      */
 
diff --git a/libraries/config_import.lib.php3 b/libraries/config_import.lib.php3
index e95a1cad6..b1a6fcce3 100644
--- a/libraries/config_import.lib.php3
+++ b/libraries/config_import.lib.php3
@@ -262,6 +262,10 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')){
         }
     }
 
+    if (!isset($cfg['SuggestDBName'])) {
+        $cfg['SuggestDBName'] = TRUE;
+    }
+
     if (!isset($cfg['ShowBlob'])) {
         if (isset($cfgShowBlob)) {
             $cfg['ShowBlob'] = $cfgShowBlob;
@@ -358,6 +362,18 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')){
         }
     }
 
+    if (!isset($cfg['DefaultTabDatabase'])
+        // rabus: config.inc.php3 rev. 1.112 had this default value.
+        || $cfg['DefaultTabDatabase'] == 'Structure') {
+        $cfg['DefaultTabDatabase'] = 'db_details_structure.php3';
+    }
+
+    if (!isset($cfg['DefaultTabTable'])
+        // rabus: config.inc.php3 rev. 1.112 had this default value.
+        || $cfg['DefaultTabTable'] == 'Structure') {
+        $cfg['DefaultTabTable'] = 'tbl_properties_structure.php3';
+    }
+
     if (!isset($cfg['ManualBaseShort'])) {
         if (isset($cfgManualBaseShort)) {
             $cfg['ManualBaseShort'] = $cfgManualBaseShort;