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

bug #3208723 [import] Fix import of utf-8 XML files.

Browse Source 
The string should be already in utf-8.
This commit is contained in:
Michal Čihař
2011-03-18 15:36:04 +01:00
parent 186426cbaf
commit efd8db8298
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

@@ -148,6 +148,7 @@
- [core] Update library PHPExcel to version 1.7.6 - [core] Update library PHPExcel to version 1.7.6
- bug #3206876 [core] Work without mbstring installed. - bug #3206876 [core] Work without mbstring installed.
- rfe #3196075, patch #3212068 [interface] Add links to variables documentation. - rfe #3196075, patch #3212068 [interface] Add links to variables documentation.
- bug #3208723 [import] Fix import of utf-8 XML files.
3.3.10.0 (not yet released) 3.3.10.0 (not yet released)
- patch #3147400 [structure] Aria table size printed as unknown, - patch #3147400 [structure] Aria table size printed as unknown,

2
libraries/import/xml.php
View File

@@ -63,7 +63,7 @@ unset($data);
* result in increased performance without the need to * result in increased performance without the need to
* alter the code in any way. It's basically a freebee. * alter the code in any way. It's basically a freebee.
*/ */
$xml = simplexml_load_string(utf8_encode($buffer), "SimpleXMLElement", LIBXML_COMPACT); $xml = simplexml_load_string($buffer, "SimpleXMLElement", LIBXML_COMPACT);
unset($buffer); unset($buffer);