[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3-6489-ga45a11f

[Madhura Jayaratne]

The branch, master has been updated
       via  a45a11f4e84c19dfa9e4ce0c2e25fc0e9dd8c01f (commit)
       via  5217946601b64ee6e92f97443cf4e515c03c0c27 (commit)
      from  6d883454046623718bd777e0f6044eb57a65a55e (commit)


- Log -----------------------------------------------------------------
commit a45a11f4e84c19dfa9e4ce0c2e25fc0e9dd8c01f
Merge: 6d883454046623718bd777e0f6044eb57a65a55e 5217946601b64ee6e92f97443cf4e515c03c0c27
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Sat Jul 2 07:12:39 2011 +0530

    Merge branch 'QA_3_4'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                        |    1 +
 libraries/display_export.lib.php |    9 +--------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b5a0cf0..504f54c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,7 @@ phpMyAdmin - ChangeLog
 - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes
 - bug #3323101 [parser] Invalid escape sequence in SQL parser
 - bug #3348995 [config] $cfg['Export']['asfile'] set to false does not select asText option
+- bug #3340151 [export] Working SQL query exports error page
 
 3.4.3.0 (2011-06-27)
 - bug #3311170 [sync] Missing helper icons in Synchronize
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index e47b170..dd6c347 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -35,13 +35,6 @@ if (empty($export_list)) {
     PMA_Message::error( __('Could not load export plugins, please check your installation!'))->display();
     require './libraries/footer.inc.php';
 }
-
-// If the form data is being loaded from GET data, decode it
-foreach($_GET as $name => $value) {
-    if(is_string($value)) {
-        $_GET[urldecode($name)] = urldecode($value);
-    }
-}
 ?>
 
 <form method="post" action="export.php" name="dump">
@@ -73,7 +66,7 @@ echo '<input type="hidden" name="export_method" value="' . htmlspecialchars($cfg
 
 
 if(isset($_GET['sql_query'])) {
-    echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars(urldecode($_GET['sql_query'])) . '" />' . "\n";
+    echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($_GET['sql_query']) . '" />' . "\n";
 } elseif (! empty($sql_query)) {
     echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($sql_query) . '" />' . "\n";
 }


hooks/post-receive
-- 
phpMyAdmin