bug #1664212 querywindow loses url encoded characters

ChangeLog

@@ -16,6 +16,7 @@ $HeadURL$
 - bug #1648802 different mysql library and server version
 - bug #1239401 table dot numeric field name
 - bug #1674972 no export with %afm%
+- bug #1664212 querywindow loses url encoded characters
 - [gui] avoid displaying a wide selector in server selection
 + [core] added PMA_fatalError() and made use of it
 . [i18n] use generic $strOptions

querywindow.php

@@ -1,8 +1,14 @@
 <?php
-/* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * @todo    move JavaScript out of here into .js files
+ * @version $Id$
+ */
 
-require_once('./libraries/common.lib.php');
+/**
+ *
+ */
+require_once './libraries/common.lib.php';
 
 $is_superuser = PMA_isSuperuser();
 
@@ -19,7 +25,7 @@ if (isset($db) && strlen($db)) {
  * Gets a core script and starts output buffering work
  */
 require_once './libraries/sql_query_form.lib.php';
-require_once('./libraries/ob.lib.php');
+require_once './libraries/ob.lib.php';
 if ($GLOBALS['cfg']['OBGzip']) {
     $ob_mode = PMA_outBufferModeGet();
     if ($ob_mode) {
@@ -27,7 +33,7 @@ if ( $GLOBALS['cfg']['OBGzip'] ) {
     }
 }
 
-require_once('./libraries/relation.lib.php');
+require_once './libraries/relation.lib.php';
 $cfgRelation = PMA_getRelationsParam();
 
 
@@ -39,8 +45,8 @@ $_input_query_history = array();
 // to a seperate file. It can now be included by libraries/header.inc.php,
 // querywindow.php.
 
-require_once('./libraries/header_http.inc.php');
-require_once('./libraries/header_meta_style.inc.php');
+require_once './libraries/header_http.inc.php';
+require_once './libraries/header_meta_style.inc.php';
 ?>
 <script type="text/javascript" language="javascript">
 //<![CDATA[
@@ -172,11 +178,11 @@ if ( ! empty( $query_history_latest ) && ! empty( $query_history_latest_db ) ) {
         'table' => isset($query_history_latest_table) ? $query_history_latest_table : '',
     );
 
-    $sql_query = urldecode($query_history_latest);
+    $sql_query = $query_history_latest;
     $db = $query_history_latest_db;
     $table = $query_history_latest_table;
 } elseif (! empty($query_history_latest)) {
-    $sql_query = urldecode($query_history_latest);
+    $sql_query = $query_history_latest;
 }
 
 if (isset($sql_query)) {
@@ -310,7 +316,7 @@ if ( count( $_sql_history ) > 0
                . htmlspecialchars($query['table']) . '\';'
                .' document.getElementById(\'hiddenqueryform\').submit();'
                .' return false;">[' . htmlspecialchars($query['db']) . '] '
-               . urldecode( $sql ) . '</a>' . "\n";
+               . htmlspecialchars($sql) . '</a>' . "\n";
 
         echo '</li>' . "\n";
     }