diff --git a/ChangeLog b/ChangeLog
index 55808c04a..4a62d78bd 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2001-11-18  Loïc Chapeaux  <lolo@phpheaven.net>
+	* db_details.php3, lines 178-492; tbl_properties.php3, lines 670-685: the
+	  "upload dump file" feature is no long displayed if upload is disabled in
+	  the php configuration file.
+
 2001-11-17  Loïc Chapeaux  <lolo@phpheaven.net>
 	* libraries/display_tbl.lib.php3:
 	  - lines 85-86: fixed bug #482627 - show full processlist should have
diff --git a/db_details.php3 b/db_details.php3
index f9fafe7ce..faa30b6f8 100755
--- a/db_details.php3
+++ b/db_details.php3
@@ -475,11 +475,20 @@ if ($num_tables > 0) {
             <input type="checkbox" name="show_query" value="y" checked="checked" />&nbsp;
                 <?php echo $strShowThisQuery; ?><br />
             </div>
-            <?php echo "<i>$strOr</i> $strLocationTextfile"; ?>&nbsp;:<br />
+<?php
+// loic1: displays import dump feature only if file upload available
+$is_upload = (PHP_INT_VERSION >= 40000 && function_exists('ini_get'))
+           ? ((strtolower(ini_get('file_uploads')) == 'on' || ini_get('file_uploads') == 1) && intval(ini_get('upload_max_filesize')))
+           : (intval(@get_cfg_var('upload_max_filesize')));
+if ($is_upload) {
+    echo '            <i>' . $strOr . '</i> ' . $strLocationTextfile . '&nbsp;:<br />' . "\n";
+    ?>
             <div style="margin-bottom: 5px">
             <input type="file" name="sql_file" /><br />
-            </div>
-<?php
+    <?php
+} // end if
+echo "\n";
+
 // Bookmark Support
 if ($cfgBookmark['db'] && $cfgBookmark['table']) {
     if (($bookmark_list = list_bookmarks($db, $cfgBookmark)) && count($bookmark_list) > 0) {
diff --git a/tbl_properties.php3 b/tbl_properties.php3
index 1ae9e4204..680693575 100755
--- a/tbl_properties.php3
+++ b/tbl_properties.php3
@@ -667,11 +667,21 @@ echo "\n";
             <input type="checkbox" name="show_query" value="y" checked="checked" />&nbsp;
                 <?php echo $strShowThisQuery; ?><br />
             </div>
-            <?php echo "<i>$strOr</i> $strLocationTextfile"; ?>&nbsp;:<br />
+<?php
+// loic1: displays import dump feature only if file upload available
+$is_upload = (PHP_INT_VERSION >= 40000 && function_exists('ini_get'))
+           ? ((strtolower(ini_get('file_uploads')) == 'on' || ini_get('file_uploads') == 1) && intval(ini_get('upload_max_filesize')))
+           : (intval(@get_cfg_var('upload_max_filesize')));
+if ($is_upload) {
+    echo '            <i>' . $strOr . '</i> ' . $strLocationTextfile . '&nbsp;:<br />' . "\n";
+    ?>
             <div style="margin-bottom: 5px">
             <input type="file" name="sql_file" /><br />
             </div>
-<?php
+    <?php
+} // end if
+echo "\n";
+
 // Bookmark Support
 if ($cfgBookmark['db'] && $cfgBookmark['table']) {
     if (($bookmark_list = list_bookmarks($db, $cfgBookmark)) && count($bookmark_list) > 0) {