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

wrong charset information in XML exports

Browse Source
This commit is contained in:
Alexander M. Turek
2002-12-21 22:05:49 +00:00
parent 9b0249d30d
commit 1a54fa69f2
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -5,6 +5,12 @@ phpMyAdmin - Changelog
$Id$
$Source$
2002-12-21 Alexander M. Turek <rabus@users.sourceforge.net>
* tbl_dump.php3:
- Fixed wrong charset information in XML exports.
- Beautified the output of the MySQL version number, e.g. '4.0.5' instead
of '4.00.05'.
2002-12-20 Alexander M. Turek <rabus@users.sourceforge.net>
* lang/italian-*.inc.php3: Updates, thanks again to Pietro Danesi (danone).

8
tbl_dump.php3
View File

@@ -129,7 +129,7 @@ else {
$ext = 'xml';
$mime_type = 'text/xml';
} else if ($what == 'latex') {
$ext = 'tex';
$ext = 'tex';
$mime_type = 'application/x-tex';
} else {
$ext = 'sql';
@@ -191,7 +191,7 @@ else {
: '\'' . $db . '\'';
$dump_buffer .= $crlf
. '# ' . $strGenTime . ': ' . PMA_localisedDate() . $crlf
. '# ' . $strServerVersion . ': ' . substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . substr(PMA_MYSQL_INT_VERSION, 1, 2) . '.' . substr(PMA_MYSQL_INT_VERSION, 3) . $crlf
. '# ' . $strServerVersion . ': ' . substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 1, 2) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 3) . $crlf
. '# ' . $strPHPVersion . ': ' . phpversion() . $crlf
. '# ' . $strDatabase . ': ' . $formatted_db_name . $crlf;
@@ -251,7 +251,7 @@ else {
// 'xml' case
else if ($GLOBALS['what'] == 'xml') {
// first add the xml tag
$dump_buffer .= '<?xml version="1.0" encoding="' . $charset . '"?>' . $crlf . $crlf;
$dump_buffer .= '<?xml version="1.0" encoding="' . $charset_of_file . '"?>' . $crlf . $crlf;
// some comments
$dump_buffer .= '<!--' . $crlf
. '-' . $crlf
@@ -265,7 +265,7 @@ else {
}
$dump_buffer .= $crlf
. '- ' . $strGenTime . ': ' . PMA_localisedDate() . $crlf
. '- ' . $strServerVersion . ': ' . substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . substr(PMA_MYSQL_INT_VERSION, 1, 2) . '.' . substr(PMA_MYSQL_INT_VERSION, 3) . $crlf
. '- ' . $strServerVersion . ': ' . substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 1, 2) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 3) . $crlf
. '- ' . $strPHPVersion . ': ' . phpversion() . $crlf
. '- ' . $strDatabase . ': \'' . $db . '\'' . $crlf
. '-' . $crlf