From 03a8fe7512ab2652df3a0f9c6b1774c4ac6b1087 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Tue, 25 Mar 2003 11:18:20 +0000
Subject: [PATCH] Neated URL generating.

---
 ChangeLog       | 1 +
 header.inc.php3 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 18c28debb..249cd93e4 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ $Source$
     * tbl_query_box.php3, tbl_properties_operations.php3,
       libraries/common.lib.php3, tbl_query_box.php3: More HTML entities fixes.
     * read_dump.php3: Fixed detection of $goto.
+    * header.inc.php3: Neated URL generating.
 
 2003-03-24 Michal Cihar  <nijel@users.sourceforge.net>
     * db_details_structure.php3, mult_submits.inc.php: Added CHECK TABLE to
diff --git a/header.inc.php3 b/header.inc.php3
index 33b773fc7..55de9091c 100755
--- a/header.inc.php3
+++ b/header.inc.php3
@@ -150,7 +150,7 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
             top.frames.queryframe.querywindow.focus();
             return false;
         } else if (top.frames.queryframe) {
-            new_win_url = 'querywindow.php3?sql_query=' + sql_query + '&<?php echo PMA_generate_common_url('', ''); ?>&db=<?php echo (isset($db) ? htmlspecialchars($db) : ''); ?>&table=<?php echo (isset($table) ? htmlspecialchars($table) : ''); ?>';
+            new_win_url = 'querywindow.php3?sql_query=' + sql_query + '&<?php echo PMA_generate_common_url(isset($db)?$db:'', isset($table)?$table:'','&'); ?>';
             top.frames.queryframe.querywindow=window.open(new_win_url, 'js_querywindow','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 (!top.frames.queryframe.querywindow.opener) {