diff --git a/ChangeLog b/ChangeLog
index f387a80f9..b5f8e97e6 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@ $Source$
 2003-02-11 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_replace_fields.php3: sometimes we receive "none" as the file
       name when there is no field upload for some field
+    * sql.php3: bug 684712, undefined variable $table (js disabled
+      and confirmation for drop database)
 
 2003-02-11 Alexander M. Turek  <rabus@users.sourceforge.net>
     * server_databases.php3: Wrong link title.
diff --git a/sql.php3 b/sql.php3
index 32cdc9ed6..d5eae68b7 100755
--- a/sql.php3
+++ b/sql.php3
@@ -1,7 +1,7 @@
 <?php
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
-
+error_reporting(E_ALL);
 /**
  * Gets some core libraries
  */
@@ -191,7 +191,7 @@ if ($do_confirm) {
     echo '<tt>' . htmlspecialchars($stripped_sql_query) . '</tt>&nbsp;?<br/>' . "\n";
     ?>
 <form action="sql.php3" method="post">
-    <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
+    <?php echo PMA_generate_common_hidden_inputs($db, (isset($table)?$table:'')); ?>
     <input type="hidden" name="sql_query" value="<?php echo urlencode(addslashes($sql_query)); ?>" />
     <input type="hidden" name="zero_rows" value="<?php echo isset($zero_rows) ? $zero_rows : ''; ?>" />
     <input type="hidden" name="goto" value="<?php echo $goto; ?>" />