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

Add xml header with encoding information (bug #836630).

Browse Source
This commit is contained in:
Michal Čihař
2003-11-06 10:01:34 +00:00
parent 10dc5d05d3
commit 2be5b01b99
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-11-06 Michal Cihar <nijel@users.sourceforge.net>
* libraries/export/xml.php3: Add xml header with encoding information
(bug #836630).
2003-11-05 Garvin Hicking <me@supergarv.de> 2003-11-05 Garvin Hicking <me@supergarv.de>
* libraries/common.lib.php3, footer.inc.php3: Bug #831181: Do not * libraries/common.lib.php3, footer.inc.php3: Bug #831181: Do not
store queries with errors in history, also when coming from the store queries with errors in history, also when coming from the

9
libraries/export/xml.php3
View File

@@ -28,7 +28,14 @@ function PMA_exportHeader() {
global $crlf; global $crlf;
global $cfg; global $cfg;
$head = '<!--' . $crlf if ($GLOBALS['output_charset_conversion']) {
$charset = $GLOBALS['charset_of_file'];
} else {
$charset = $GLOBALS['charset'];
}
$head = '<?xml version="1.0" encoding="' . $charset . '" ?>' . $crlf
. '<!--' . $crlf
. '-' . $crlf . '-' . $crlf
. '- phpMyAdmin XML Dump' . $crlf . '- phpMyAdmin XML Dump' . $crlf
. '- version ' . PMA_VERSION . $crlf . '- version ' . PMA_VERSION . $crlf