nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
Michal Čihař
2010-03-30 20:40:09 +02:00
parent a1623a02d4 3d48316d94
commit 3c796fd54f
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -69,6 +69,7 @@ $Id$
- patch #2976790 [menu] Go to the upper level after table DROP, - patch #2976790 [menu] Go to the upper level after table DROP,
thanks to Kaarel Nummert - kaarelnu thanks to Kaarel Nummert - kaarelnu
- patch #2978815 [pdf] Fix generating PDF with table dimensions, thanks to BlinK_ - 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) 3.3.1.0 (2010-03-16)
- bug #2941037 [core] Database structure not sorted by table correctly - bug #2941037 [core] Database structure not sorted by table correctly

2
libraries/export/xml.php
View File

@@ -337,7 +337,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
if (!isset($record[$i]) || is_null($record[$i])) { if (!isset($record[$i]) || is_null($record[$i])) {
$record[$i] = 'NULL'; $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; . '</column>' . $crlf;
} }
$buffer .= ' </table>' . $crlf; $buffer .= ' </table>' . $crlf;