From 667d2714c0e79481e5272b8f946bf29b7aa0a011 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 11 Oct 2004 10:12:25 +0000
Subject: [PATCH] Don't try to replace %t and %f when table name is empty.

---
 ChangeLog         | 7 +++++--
 tbl_query_box.php | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 542ee2636..964d63aae 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-10-11 Michal Čihař  <michal@cihar.com>
+    * tbl_query_box.php: Don't try to replace %t and %f when table name is empty.
+
 2004-10-08 Garvin Hicking <pma@supergarv.de>
     * lots of files: Adjusted superfluous spaces, added
       more CSS-ID attributes for better themeability.
@@ -17,7 +20,7 @@ $Source$
     * export.php: bug #1038804, insufficient space to save
 
 2004-09-30 Marc Delisle  <lem9@users.sourceforge.net>
-    * tbl_addfield.php: bug #1037744 (CVS version only): cannot add a field 
+    * tbl_addfield.php: bug #1037744 (CVS version only): cannot add a field
     * tbl_create.php: cannot create a new table (CVS version only)
 
 2004-09-29 Marc Delisle  <lem9@users.sourceforge.net>
@@ -61,7 +64,7 @@ $Source$
       not displayed anymore
     * read_dump.php: bug #1033133, left frame not reloaded after dump read
     * db_datadict.php: bug #1034299, error in SHOW KEYS for data dict
-    * read_dump.php: bug #1034216 open_basedir and file upload, 
+    * read_dump.php: bug #1034216 open_basedir and file upload,
       thanks to Dominique Rousseau - domi
 
 2004-09-24 Michal Čihař  <michal@cihar.com>
diff --git a/tbl_query_box.php b/tbl_query_box.php
index 499cd4589..b376e7d51 100644
--- a/tbl_query_box.php
+++ b/tbl_query_box.php
@@ -157,10 +157,10 @@ if (!isset($is_inside_querywindow) ||
                     <textarea name="sql_query" rows="<?php echo $cfg['TextareaRows']; ?>" cols="<?php echo ((isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && $queryframe_tdcolspan != '') ? ceil($cfg['TextareaCols'] * 1.25) : $cfg['TextareaCols'] * 2); ?>" dir="<?php echo $text_dir; ?>"<?php echo $auto_sel; ?>><?php
     if (!empty($query_to_display)) {
         echo htmlspecialchars($query_to_display);
-    } elseif (isset($table)) {
+    } elseif (isset($table) && !empty($table)) {
         echo htmlspecialchars(
-            str_replace('%d', PMA_backquote($db), 
-                str_replace('%t', PMA_backquote($table), 
+            str_replace('%d', PMA_backquote($db),
+                str_replace('%t', PMA_backquote($table),
                     str_replace('%f', implode(', ', PMA_backquote($fields_list)),
                         $cfg['DefaultQueryTable']))));
     } else {