From 886e0f0dac51d64d56c7e2275bccf57f702fe1b3 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 24 Nov 2005 14:50:54 +0000
Subject: [PATCH] bug 1365503

---
 ChangeLog         | 3 +++
 js/querywindow.js | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e555b765e..9a7edc524 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-11-24 Marc Delisle  <lem9@users.sourceforge.net>
+    * js/querywindow.js: bug #1365503, "do not overwrite this query"
+
 2005-11-24 Michal Čihař  <michal@cihar.com>
     * libraries/header_http.inc.php, libraries/header_meta_style.inc.php: Fix
       XSS on some libraries (CVE-2005-3665).
diff --git a/js/querywindow.js b/js/querywindow.js
index 605acf69e..041b0821f 100644
--- a/js/querywindow.js
+++ b/js/querywindow.js
@@ -144,8 +144,12 @@ function open_querywindow( url ) {
 }
 
 function refreshQuerywindow( url ) {
+
     if ( ! querywindow.closed && querywindow.location ) {
-        open_querywindow( url )
+        if ( ! querywindow.document.sqlform.LockFromUpdate
+          || ! querywindow.document.sqlform.LockFromUpdate.checked ) {
+            open_querywindow( url )
+        }
     }
 }