[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-80-gbb0ad40

[Marc Delisle]

The branch, QA_3_3 has been updated
       via  bb0ad40413a0d049126bfa4f040e5bdc43a9f488 (commit)
      from  86cd86fc513aa79eafdf9910b60976ac5750d4eb (commit)


- Log -----------------------------------------------------------------
commit bb0ad40413a0d049126bfa4f040e5bdc43a9f488
Author: Victor Volkov <hanut at users.sourceforge.net>
Date:   Tue Mar 30 12:56:06 2010 -0400

    Patch #2977725 XML export wrongly encoded

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

Summary of changes:
 ChangeLog                |    1 +
 libraries/export/xml.php |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f4da7a0..cf576c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - patch #2976790 [menu] Go to the upper level after table DROP,
   thanks to Kaarel Nummert - kaarelnu
 - patch #2978815 [pdf] Fix generating PDF with table dimensions, thanks to BlinK_
+- patch #2977725 [export] XML wrongly encoded, thanks to Victor Volkov - hanut
 
 3.3.1.0 (2010-03-16)
 - bug #2941037 [core] Database structure not sorted by table correctly 
diff --git a/libraries/export/xml.php b/libraries/export/xml.php
index 5b82ad5..aab58d0 100644
--- a/libraries/export/xml.php
+++ b/libraries/export/xml.php
@@ -337,7 +337,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
                 if (!isset($record[$i]) || is_null($record[$i])) {
                     $record[$i] = 'NULL';
                 }
-                $buffer .= '            <column name="' . $columns[$i] . '">' . htmlspecialchars(utf8_encode((string)$record[$i]))
+                $buffer .= '            <column name="' . $columns[$i] . '">' . htmlspecialchars((string)$record[$i])
                         .  '</column>' . $crlf;
             }
             $buffer         .= '        </table>' . $crlf;


hooks/post-receive
-- 
phpMyAdmin