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

Do not escape SQL query twice while showing it in error message (bug #1336452).

Browse Source
This commit is contained in:
Michal Čihař
2005-10-30 17:52:49 +00:00
parent bc9b7aa8b3
commit e6c5fd8027
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -12,6 +12,8 @@ $Source$
* lang/japanese: Update, thanks to Tadashi Jokagi - elf2000. * lang/japanese: Update, thanks to Tadashi Jokagi - elf2000.
* libraries/display_tbl.lib.php: Do not break on special chars in column * libraries/display_tbl.lib.php: Do not break on special chars in column
name (bug #1180668). name (bug #1180668).
* libraries/common.lib.php: Do not escape SQL query twice while showing it
in error message (bug #1336452).
2005-10-29 Michal Čihař <michal@cihar.com> 2005-10-29 Michal Čihař <michal@cihar.com>
* Documentation.html, config.default.php, libraries/common.lib.php: Link * Documentation.html, config.default.php, libraries/common.lib.php: Link

2
libraries/common.lib.php
View File

@@ -606,7 +606,7 @@ if ($is_minimum_common == FALSE) {
} elseif (empty($the_query) || trim($the_query) == '') { } elseif (empty($the_query) || trim($the_query) == '') {
$formatted_sql = ''; $formatted_sql = '';
} else { } else {
$formatted_sql = PMA_formatSql(PMA_SQP_parse(PMA_sanitize($the_query)), $the_query); $formatted_sql = PMA_formatSql(PMA_SQP_parse($the_query), $the_query);
} }
// --- // ---
echo "\n" . '<!-- PMA-SQL-ERROR -->' . "\n"; echo "\n" . '<!-- PMA-SQL-ERROR -->' . "\n";