nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't try to replace %t and %f when table name is empty.

Browse Source
This commit is contained in:
Michal Čihař
2004-10-11 10:12:25 +00:00
parent 9392a58483
commit 667d2714c0
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $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> 2004-10-08 Garvin Hicking <pma@supergarv.de>
* lots of files: Adjusted superfluous spaces, added * lots of files: Adjusted superfluous spaces, added
more CSS-ID attributes for better themeability. more CSS-ID attributes for better themeability.
@@ -17,7 +20,7 @@ $Source$
* export.php: bug #1038804, insufficient space to save * export.php: bug #1038804, insufficient space to save
2004-09-30 Marc Delisle <lem9@users.sourceforge.net> 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) * tbl_create.php: cannot create a new table (CVS version only)
2004-09-29 Marc Delisle <lem9@users.sourceforge.net> 2004-09-29 Marc Delisle <lem9@users.sourceforge.net>
@@ -61,7 +64,7 @@ $Source$
not displayed anymore not displayed anymore
* read_dump.php: bug #1033133, left frame not reloaded after dump read * read_dump.php: bug #1033133, left frame not reloaded after dump read
* db_datadict.php: bug #1034299, error in SHOW KEYS for data dict * 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 thanks to Dominique Rousseau - domi
2004-09-24 Michal Čihař <michal@cihar.com> 2004-09-24 Michal Čihař <michal@cihar.com>

6
tbl_query_box.php
View File

@@ -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 <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)) { if (!empty($query_to_display)) {
echo htmlspecialchars($query_to_display); echo htmlspecialchars($query_to_display);
} elseif (isset($table)) { } elseif (isset($table) && !empty($table)) {
echo htmlspecialchars( echo htmlspecialchars(
str_replace('%d', PMA_backquote($db), str_replace('%d', PMA_backquote($db),
str_replace('%t', PMA_backquote($table), str_replace('%t', PMA_backquote($table),
str_replace('%f', implode(', ', PMA_backquote($fields_list)), str_replace('%f', implode(', ', PMA_backquote($fields_list)),
$cfg['DefaultQueryTable'])))); $cfg['DefaultQueryTable']))));
} else { } else {