From ac60f9bf1cf35d768ab63787441d61bf3ca81dc6 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Sat, 28 Sep 2002 17:38:38 +0000
Subject: [PATCH] undefined index

---
 ChangeLog                        | 4 +++-
 libraries/config_import.lib.php3 | 7 +++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7f05db8bb..61c4c33ae 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,7 +8,9 @@ $Source$
 2002-09-28 Alexander M. Turek  <rabus@users.sourceforge.net>
     * libraries/common.lib.php3: $cfg['PmaAbsoluteURI'] detection did not work
       properly on IIS 6.0.
-    * libraries/config_import.lib.php3: Fixed an inconsitence.
+    * libraries/config_import.lib.php3:
+      - Fixed an inconsitence;
+      - Fixed an "undefined index" error.
 
 2002-09-27 Loïc Chapeaux  <lolo@phpheaven.net>
     * db_details_qbe.php3: PHP3 fixes & coding standards.
diff --git a/libraries/config_import.lib.php3 b/libraries/config_import.lib.php3
index c93c95c21..d77a5291f 100644
--- a/libraries/config_import.lib.php3
+++ b/libraries/config_import.lib.php3
@@ -620,10 +620,9 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')){
         $cfg['SQLQuery']['Validate'] = FALSE;
     }
 
-// do not set a value here, an empty value means to not use the feature
-//    if (!isset($cfg['UploadDir'])) {
-//        $cfg['UploadDir'] = './upload/';
-//    }
+    if (!isset($cfg['UploadDir'])) {
+        $cfg['UploadDir'] = '';
+    }
 
     if (!isset($cfg['SQLValidator']['use'])) {
         $cfg['SQLValidator']['use'] = FALSE;