diff --git a/ChangeLog b/ChangeLog
index 7d10a9354..8f07e3012 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@ $Id$
 $Source$
 
 2004-05-03 Garvin Hicking <pma@supergarv.de>
+    * config.inc.php, libraries/config_import.lib.php, querywindow.php,
+      footer.inc.php, Documentation.html: Removed obsolete
+      QueryFrameDebug configuration directive
     * tbl_row_delete.php: Multi Row edit/delete: Fixed wrong switch
       structure to take previous settings into account.
 
diff --git a/Documentation.html b/Documentation.html
index 0014abfdd..f040958c1 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -1722,7 +1722,6 @@ Defaults to FALSE (drop-down). <br />
 
     <dt><b>$cfg['QueryFrame'] </b>boolean<br />
         <b>$cfg['QueryFrameJS'] </b>boolean<br />
-        <b>$cfg['QueryFrameDebug'] </b>boolean<br />
         <b>$cfg['QueryWindowWidth'] </b>integer<br />
         <b>$cfg['QueryWindowHeight'] </b>integer<br />
         <b>$cfg['QueryHistoryDB'] </b>boolean<br />
@@ -1773,9 +1772,6 @@ Defaults to FALSE (drop-down). <br />
         default tab to be used when opening the query window. It can be set to
         either 'sql', 'files', 'history' or 'full'.
         <br /><br />
-        The variable $cfg['QueryFrameDebug'] can be used by developers for
-        easier future feature integration.
-        <br /><br />
     </dd>
 
     <dt><b>$cfg['BrowseMIME'] </b>boolean</dt>
diff --git a/config.inc.php b/config.inc.php
index 9d284c74a..b699f5dfa 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -495,7 +495,6 @@ $cfg['RepeatCells']         = 100;          // repeat header names every X cells
 $cfg['QueryFrame']          = TRUE;         // displays a new frame where a link to a querybox is always displayed.
 $cfg['QueryFrameJS']        = TRUE;         // whether to use JavaScript functions for opening a new window for SQL commands.
                                             // if set to 'false', the target of the querybox is always the right frame.
-$cfg['QueryFrameDebug']     = FALSE;        // display JS debugging link (DEVELOPERS only)
 $cfg['QueryWindowWidth']    = 550;          // Width of Query window
 $cfg['QueryWindowHeight']   = 310;          // Height of Query window
 $cfg['QueryHistoryDB']      = FALSE;         // Set to TRUE if you want DB-based query history.
diff --git a/footer.inc.php b/footer.inc.php
index b5ba7f283..ed42240ac 100644
--- a/footer.inc.php
+++ b/footer.inc.php
@@ -20,15 +20,6 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
 <script type="text/javascript">
 <!--
 <?php
-    if ($cfg['QueryFrameDebug']) {
-    ?>
-        document.writeln("Updating query window. DB: <?php echo (isset($db) ? addslashes($db) : 'FALSE'); ?>, Table: <?php echo (isset($table) ? addslashes($table) : 'FALSE'); ?><br />");
-        document.writeln("Window: " + parent.frames.queryframe.querywindow.location + "<br />");
-    <?php
-    }
-    ?>
-
-    <?php
     if (!isset($no_history) && (!isset($error_message) || $error_message == '')) {
     ?>
     if (parent.frames.queryframe && parent.frames.queryframe.document && parent.frames.queryframe.document.queryframeform) {
@@ -41,8 +32,6 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
 
     function reload_querywindow () {
         if (parent.frames.queryframe && parent.frames.queryframe.querywindow && !parent.frames.queryframe.querywindow.closed && parent.frames.queryframe.querywindow.location) {
-            <?php echo ($cfg['QueryFrameDebug'] ? 'document.writeln("<a href=\'#\' onClick=\'parent.frames.queryframe.querywindow.focus(); return false;\'>Query Window</a> can be updated.<br />");' : ''); ?>
-
             <?php
             if (!isset($no_history) && (!isset($error_message) || $error_message == '')) {
                 if (isset($LockFromUpdate) && $LockFromUpdate == '1' && isset($sql_query)) {
@@ -61,7 +50,6 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
 
                 <?php echo (isset($sql_query) ? 'parent.frames.queryframe.querywindow.document.querywindow.query_history_latest.value = "' . urlencode($sql_query) . '";' : '// no sql query update') . "\n"; ?>
 
-                <?php echo ($cfg['QueryFrameDebug'] ? 'alert(\'Querywindow submits. Last chance to check variables.\');' : '') . "\n"; ?>
                 parent.frames.queryframe.querywindow.document.querywindow.submit();
             }
             <?php
diff --git a/libraries/config_import.lib.php b/libraries/config_import.lib.php
index e28127f92..0b8355981 100644
--- a/libraries/config_import.lib.php
+++ b/libraries/config_import.lib.php
@@ -767,10 +767,6 @@ if (!isset($cfg['QueryFrameJS'])) {
     $cfg['QueryFrameJS'] = TRUE;
 }
 
-if (!isset($cfg['QueryFrameDebug'])) {
-    $cfg['QueryFrameDebug'] = FALSE;
-}
-
 if (!isset($cfg['QueryWindowWidth'])) {
     $cfg['QueryWindowWidth'] = 550;
 }
diff --git a/querywindow.php b/querywindow.php
index d0610b0c9..f1bab48d2 100644
--- a/querywindow.php
+++ b/querywindow.php
@@ -48,25 +48,6 @@ require_once('./libraries/header_meta_style.inc.php');
 ?>
 
 <script type="text/javascript" language="javascript">
-<?php
-if ($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && $cfg['QueryFrameDebug']) {
-    $js_db = (isset($db) ? $db : 'FALSE');
-    $js_table = (isset($table) ? $table : 'FALSE');
-    $js_server = (isset($server) ? $server : 'FALSE');
-
-    $js_true_db = '\' + document.querywindow.db.value + \'';
-    $js_true_table = '\' + document.querywindow.table.value + \'';
-    $js_true_server = '\' + document.querywindow.server.value + \'';
-
-    $js_parent = '\' + opener.location.href + \'';
-    $js_frame = '\' + opener.parent.location.href + \'';
-?>
-function debug() {
-    alert('<?php echo sprintf($strQueryFrameDebugBox, $js_db, $js_table, $js_server, $js_true_db, $js_true_table, $js_true_server, $js_parent, $js_frame); ?>');
-    return false;
-}
-<?php
-}
 ?>
 function query_auto_commit() {
     document.sqlform.submit();
@@ -262,17 +243,6 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
 </form>
 <?php
 }
-
-/* REMOVE ME */
-if ($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && $cfg['QueryFrameDebug']) {
-?>
-<br />
-<center>
-    <a href='#' onClick='return debug();'><?php echo $strQueryFrameDebug; ?></a>
-</center>
-<?php
-}
-/* REMOVE ME */
 ?>
 
 </body>