The branch, master has been updated via 3d48316d94b4e0192122ce66f4a3d5f36f221b7f (commit) via 91ab521480fbbcf7a53a579bf3c35da27ab629c1 (commit) via bb0ad40413a0d049126bfa4f040e5bdc43a9f488 (commit) from 375c9079b8a132ac6fcfca37c6793b2df63bffe6 (commit)
- Log ----------------------------------------------------------------- commit 3d48316d94b4e0192122ce66f4a3d5f36f221b7f Merge: 91ab521480fbbcf7a53a579bf3c35da27ab629c1 375c9079b8a132ac6fcfca37c6793b2df63bffe6 Author: Marc Delisle marc@infomarc.info Date: Tue Mar 30 12:58:12 2010 -0400
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit 91ab521480fbbcf7a53a579bf3c35da27ab629c1 Merge: e0e4132aa18b4ffc9c4e7fab0c8a2a607aea9f9e bb0ad40413a0d049126bfa4f040e5bdc43a9f488 Author: Marc Delisle marc@infomarc.info Date: Tue Mar 30 12:56:17 2010 -0400
Merge branch 'QA_3_3'
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 1 + libraries/export/xml.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 03a09ce..23198f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,7 @@ $Id$ - 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