From 67eee6d625f6ddd438ea03b3c191ea6637270fcb Mon Sep 17 00:00:00 2001
From: Garvin Hicking <me@supergarv.de>
Date: Mon, 24 Feb 2003 18:26:30 +0000
Subject: [PATCH] Location of README-file, import of new configuration
 directives.

---
 ChangeLog                        |  4 +-
 config.inc.php3                  |  2 +-
 libraries/config_import.lib.php3 | 99 ++++++++++++++++++++++++++++++++
 3 files changed, 102 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1002d066b..690756ed7 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -42,8 +42,8 @@ $Source$
 
     * Display MIME types to transform any table cell. You can only choose from a
         list of pre-defined MIME-types. The list gets built by a function searching
-        a directory for valid transforms. For further information see README-file and soon
-        documentation. ;)
+        a directory for valid transforms. For further information see
+        libraries/transformations/README-file and soon in documentation. ;)
         Files: tbl_properties.inc.php3, transformations.lib.php3, relation.lib.php3,
         create_tables.sql, tbl_addfield.php3, tbl_alter.php3, tbl_create.php3,
         tbl_move_copy.php3, transformation_wrapper.php3,
diff --git a/config.inc.php3 b/config.inc.php3
index 68e054adf..791641b02 100755
--- a/config.inc.php3
+++ b/config.inc.php3
@@ -380,7 +380,7 @@ $cfg['QueryFrameDebug']     = FALSE;        // display JS debugging link (DEVELO
 $cfg['QueryWindowWidth']     = 750;          // Width of Query window
 $cfg['QueryWindowHeight']    = 300;          // Height of Query window
  
-+$cfg['BrowseMIME']          = TRUE;         // Use MIME-Types (stored in column comments table) for
+$cfg['BrowseMIME']          = TRUE;         // Use MIME-Types (stored in column comments table) for
 
 /**
  * SQL Query box settings
diff --git a/libraries/config_import.lib.php3 b/libraries/config_import.lib.php3
index 1153358ea..87d207427 100644
--- a/libraries/config_import.lib.php3
+++ b/libraries/config_import.lib.php3
@@ -613,6 +613,105 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
         }
     }
 
+    if (!isset($cfg['HeaderFlipType'])) {
+        if (isset($cfgHeaderFlipType)) {
+            $cfg['HeaderFlipType'] = $cfgHeaderFlipType;
+            unset($cfgHeaderFlipType);
+        } else {
+            $cfg['HeaderFlipType'] = 'css';
+        }
+    }
+
+    if (!isset($cfg['ShowBrowseComments'])) {
+        if (isset($cfgShowBrowseComments)) {
+            $cfg['ShowBrowseComments'] = $cfgShowBrowseComments;
+            unset($cfgShowBrowseComments);
+        } else {
+            $cfg['ShowBrowseComments'] = TRUE;
+        }
+    }
+
+    if (!isset($cfg['ShowPropertyComments'])) {
+        if (isset($cfgShowPropertyComments)) {
+            $cfg['ShowPropertyComments'] = $cfgShowPropertyComments;
+            unset($cfgShowPropertyComments);
+        } else {
+            $cfg['ShowPropertyComments'] = TRUE;
+        }
+    }
+
+    if (!isset($cfg['QueryFrame'])) {
+        if (isset($cfgQueryFrame)) {
+            $cfg['QueryFrame'] = $cfgQueryFrame;
+            unset($cfgQueryFrame);
+        } else {
+            $cfg['QueryFrame'] = TRUE;
+        }
+    }
+
+    if (!isset($cfg['QueryFrameJS'])) {
+        if (isset($cfgQueryFrameJS)) {
+            $cfg['QueryFrameJS'] = $cfgQueryFrameJS;
+            unset($cfgQueryFrameJS);
+        } else {
+            $cfg['QueryFrameJS'] = TRUE;
+        }
+    }
+
+    if (!isset($cfg['QueryFrameDebug'])) {
+        if (isset($cfgQueryFrameDebug)) {
+            $cfg['QueryFrameDebug'] = $cfgQueryFrameDebug;
+            unset($cfgQueryFrameDebug);
+        } else {
+            $cfg['QueryFrameDebug'] = FALSE;
+        }
+    }
+
+    if (!isset($cfg['QueryWindowWidth'])) {
+        if (isset($cfgQueryWindowWidth)) {
+            $cfg['QueryWindowWidth'] = $cfgQueryWindowWidth;
+            unset($cfgQueryWindowWidth);
+        } else {
+            $cfg['QueryWindowWidth'] = 750;
+        }
+    }
+
+    if (!isset($cfg['QueryWindowHeight'])) {
+        if (isset($cfgQueryWindowHeight)) {
+            $cfg['QueryWindowHeight'] = $cfgQueryWindowHeight;
+            unset($cfgQueryWindowHeight);
+        } else {
+            $cfg['QueryWindowHeight'] = 300;
+        }
+    }
+
+    if (!isset($cfg['BrowseMIME'])) {
+        if (isset($cfgBrowseMIME)) {
+            $cfg['BrowseMIME'] = $cfgBrowseMIME;
+            unset($cfgBrowseMIME);
+        } else {
+            $cfg['BrowseMIME'] = TRUE;
+        }
+    }
+
+    if (!isset($cfg['ShowTooltipAliasDB'])) {
+        if (isset($cfgShowTooltipAliasDB)) {
+            $cfg['ShowTooltipAliasDB'] = $cfgShowTooltipAliasDB;
+            unset($cfgShowTooltipAliasDB);
+        } else {
+            $cfg['ShowTooltipAliasDB'] = FALSE;
+        }
+    }
+
+    if (!isset($cfg['ShowTooltipAliasTB'])) {
+        if (isset($cfgShowTooltipAliasTB)) {
+            $cfg['ShowTooltipAliasTB'] = $cfgShowTooltipAliasTB;
+            unset($cfgShowTooltipAliasTB);
+        } else {
+            $cfg['ShowTooltipAliasTB'] = FALSE;
+        }
+    }
+
     if (!isset($cfg['SQLQuery']['Edit'])) {
         $cfg['SQLQuery']['Edit'] = TRUE;
     }