From 10dc5d05d3deaee239d51ac97b69c88f4ca1ee9d Mon Sep 17 00:00:00 2001
From: Garvin Hicking <me@supergarv.de>
Date: Wed, 5 Nov 2003 15:40:55 +0000
Subject: [PATCH] Bug 831181

---
 ChangeLog                 |  3 +++
 footer.inc.php3           | 22 +++++++++++-----------
 libraries/common.lib.php3 |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 089daf44d..c51f913ff 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@ $Id$
 $Source$
 
 2003-11-05 Garvin Hicking <me@supergarv.de>
+    * libraries/common.lib.php3, footer.inc.php3: Bug #831181: Do not 
+      store queries with errors in history, also when coming from the 
+      database SQL tab.
     * libraries/common.lib.php3: Bug #835854. The MySQL-error messages
       are now put inside a <code> HTML-container, not <pre>. This allows
       wordwrapping to hide vertical scrollbars. Linebreak/Whitespace
diff --git a/footer.inc.php3 b/footer.inc.php3
index 5d6546a1e..12e4f9c2f 100755
--- a/footer.inc.php3
+++ b/footer.inc.php3
@@ -24,9 +24,9 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
     <?php
     }
     ?>
-    
+
     <?php
-    if (!isset($error_message) || $error_message == '') {
+    if (!isset($no_history) && (!isset($error_message) || $error_message == '')) {
     ?>
     if (parent.frames.queryframe && parent.frames.queryframe.document && parent.frames.queryframe.document.queryframeform) {
         parent.frames.queryframe.document.queryframeform.db.value = "<?php echo (isset($db) ? addslashes($db) : ''); ?>";
@@ -35,13 +35,13 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
     <?php
     }
     ?>
-    
+
     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($error_message) || $error_message == '') {
+            if (!isset($no_history) && (!isset($error_message) || $error_message == '')) {
                 if (isset($LockFromUpdate) && $LockFromUpdate == '1' && isset($sql_query)) {
                     // When the button 'LockFromUpdate' was selected in the querywindow, it does not submit it's contents to
                     // itself. So we create a SQL-history entry here.
@@ -55,9 +55,9 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
                 parent.frames.queryframe.querywindow.document.querywindow.query_history_latest_db.value = "<?php echo (isset($db) ? addslashes($db) : '') ?>";
                 parent.frames.queryframe.querywindow.document.querywindow.table.value = "<?php echo (isset($table) ? addslashes($table) : '') ?>";
                 parent.frames.queryframe.querywindow.document.querywindow.query_history_latest_table.value = "<?php echo (isset($table) ? addslashes($table) : '') ?>";
-        
+
                 <?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();
             }
@@ -86,7 +86,7 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
         } else if (parent.frames.queryframe) {
             new_win_url = 'querywindow.php3?sql_query=' + sql_query + '&<?php echo PMA_generate_common_url(isset($db) ? addslashes($db) : '', isset($table) ? addslashes($table) : '', '&'); ?>';
             parent.frames.queryframe.querywindow=window.open(new_win_url, '','toolbar=0,location=1,directories=0,status=1,menubar=0,scrollbars=yes,resizable=yes,width=<?php echo $cfg['QueryWindowWidth']; ?>,height=<?php echo $cfg['QueryWindowHeight']; ?>');
-    
+
             if (!parent.frames.queryframe.querywindow.opener) {
                parent.frames.queryframe.querywindow.opener = parent.frames.queryframe;
             }
@@ -132,9 +132,9 @@ if (isset($GLOBALS['userlink']) && $GLOBALS['userlink']) {
 /**
  * Generates profiling data if requested
  */
-if (isset($GLOBALS['cfg']['DBG']['enable']) 
-        && $GLOBALS['cfg']['DBG']['enable'] 
-        && isset($GLOBALS['cfg']['DBG']['profile']['enable']) 
+if (isset($GLOBALS['cfg']['DBG']['enable'])
+        && $GLOBALS['cfg']['DBG']['enable']
+        && isset($GLOBALS['cfg']['DBG']['profile']['enable'])
         && $GLOBALS['cfg']['DBG']['profile']['enable']) {
     //run the basic setup code first
     include('./libraries/dbg/setup.php3');
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index 176921242..9a75a7f67 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -521,7 +521,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
             echo PMA_showMySQLDocu('Error-returns', 'Error-returns');
 
             if (!empty($back_url) && $exit) {
-                echo '&nbsp;&middot;&nbsp;[<a href="' . $back_url . '">' . $GLOBALS['strBack'] . '</a>]';
+                echo '&nbsp;&middot;&nbsp;[<a href="' . (strstr($back_url, '?') ? $back_url . '&amp;no_history=true' : $back_url . '?no_history=true') . '">' . $GLOBALS['strBack'] . '</a>]';
             }
             echo "\n";