From e6c5fd8027a8422cb1ba2d2d24ed00167e9483ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Sun, 30 Oct 2005 17:52:49 +0000
Subject: [PATCH] Do not escape SQL query twice while showing it in error
 message (bug #1336452).

---
 ChangeLog                | 2 ++
 libraries/common.lib.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 37ffe194f..326403b5e 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@ $Source$
     * lang/japanese: Update, thanks to Tadashi Jokagi - elf2000.
     * libraries/display_tbl.lib.php: Do not break on special chars in column
       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>
     * Documentation.html, config.default.php, libraries/common.lib.php: Link
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index f21cb1a13..4998276ba 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -606,7 +606,7 @@ if ($is_minimum_common == FALSE) {
         } elseif (empty($the_query) || trim($the_query) == '') {
             $formatted_sql = '';
         } 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";