diff --git a/ChangeLog b/ChangeLog
index f0787b8d3..7b5174cd8 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-08-06 Marc Delisle  <lem9@users.sourceforge.net>
+    * tbl_properties_links.php3: bug 590867: avoid undefined variable
+      and add comments in the code for a future correction
+
 2002-08-06 Loïc Chapeaux  <lolo@phpheaven.net>
     * libraries/display_tbl.lib.php3, line 1412: do not die if relation table
       is broken in browse mode.
diff --git a/tbl_properties_links.php3 b/tbl_properties_links.php3
index 54c0dd11a..6dc497411 100755
--- a/tbl_properties_links.php3
+++ b/tbl_properties_links.php3
@@ -1,7 +1,6 @@
 <?php
 /* $Id$ */
-
-
+error_reporting(E_ALL);
 /**
  * Count amount of navigation tabs
  */
@@ -37,10 +36,18 @@ if ($table_info_num_rows > 0) {
     $att6    = '';
 }
 
+// The use of $sub_part when setting $arg7 would work if all sub-pages
+// scripts were prefixed by "tbl_properties", but this is not the case
+// for now. The 'back' is supposed to be set to the current sub-page. This
+// is necessary when you have js deactivated, you click on Drop, then click
+// cancel, and want to get back to the same sub-page.
+
+if (!isset($sub_part)) {
+    $sub_part = '';
+}
 $arg7 = ereg_replace('tbl_properties.php3$', 'db_details.php3', $url_query) . '&amp;back=tbl_properties' . $sub_part . '.php3&amp;reload=1&amp;sql_query=' . urlencode('DROP TABLE ' . PMA_backquote($table) ) . '&amp;zero_rows=' . urlencode(sprintf($strTableHasBeenDropped, htmlspecialchars($table)));
 $att7 = 'class="drop" onclick="return confirmLink(this, \'DROP TABLE ' . PMA_jsFormat($table) . '\')"';
 
-
 /**
  * Displays links
  */