From 4e72fdbd35d98f08095693e607d0494bb5089744 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Sun, 2 Feb 2003 15:01:51 +0000
Subject: [PATCH] Backwards compatibility.

---
 ChangeLog                        |  8 ++++++--
 libraries/common.lib.php3        |  2 +-
 libraries/config_import.lib.php3 | 12 ++++++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bb519c68b..8c6d32eae 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-02-02 Alexander M. Turek  <rabus@users.sourceforge.net>
+    * libiraries/common.lib.php3, libraries/config_import.lib.php3: Backwards
+      compatibility.
+
 2003-02-02 Michal Cihar  <nijel@users.sourceforge.net>
     * lang/czech: Updated.
     * lang/sort_lang.sh: This needs bash.
@@ -14,7 +18,7 @@ $Source$
     * lang/norwegian: update, thanks to Sven-Erik Andersen
     * libraries/kanji-encoding.lib.php3 bug fix, thanks to Yukihiro Kawada
     * libraries/dbg/setup.php3, lang/*: generic $strCantLoad
-      (later when we get enough translations, 
+      (later when we get enough translations,
        we can use it instead of $strCandLoadMySQL)
 
 2003-02-01 Robin Johnson  <robbat2@users.sourceforge.net>
@@ -24,7 +28,7 @@ $Source$
     * Documentation.html: Removed a bit of duplication in [7.4] and the
     Developers section
     * libraries/dbg: New directory for DBG code
-    * libraries/dbg/setup.php3: 
+    * libraries/dbg/setup.php3:
        - DBG initialization code, including module support
     * libraries/dbg/profiling.php3: Profiling code
     * lang/*: New strings added for DBG extension
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index 62ea6c924..36d26c39d 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -130,7 +130,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) < 153) {
+    if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 155) {
         include('./libraries/config_import.lib.php3');
     }
 
diff --git a/libraries/config_import.lib.php3 b/libraries/config_import.lib.php3
index 13f6b3dae..41b85d09e 100644
--- a/libraries/config_import.lib.php3
+++ b/libraries/config_import.lib.php3
@@ -641,8 +641,16 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
         $cfg['SQLValidator']['password'] = '';
     }
 
-    if (!isset($cfg['SQLValidator']['DisplayCopyright'])) {
-        $cfg['SQLValidator']['DisplayCopyright'] = TRUE;
+    if (!isset($cfg['DBG']['enable'])) {
+        $cfg['DBG']['enable'] = FALSE;
+    }
+
+    if (!isset($cfg['DBG']['profile']['enable'])) {
+        $cfg['DBG']['profile']['enable'] = FALSE;
+    }
+
+    if (!isset($cfg['DBG']['profile']['threshold'])) {
+        $cfg['DBG']['profile']['threshold'] = 0.5;
     }
 
     if (!isset($cfg['SQP']['enable'])) {