The branch, master has been updated via efd8db8298bbf288ad596efd918661a3d3e8492d (commit) from 186426cbaf0262b49dfc4a67e4b1347296ef0219 (commit)

- Log ----------------------------------------------------------------- commit efd8db8298bbf288ad596efd918661a3d3e8492d Author: Michal Čihař mcihar@novell.com Date: Fri Mar 18 15:36:04 2011 +0100

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

The string should be already in utf-8.

-----------------------------------------------------------------------

Summary of changes: ChangeLog | 1 + libraries/import/xml.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog index e570b21..8973673 100644 --- a/ChangeLog +++ b/ChangeLog @@ -148,6 +148,7 @@ - [core] Update library PHPExcel to version 1.7.6 - bug #3206876 [core] Work without mbstring installed. - 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) - patch #3147400 [structure] Aria table size printed as unknown, diff --git a/libraries/import/xml.php b/libraries/import/xml.php index 4984e45..640aac8 100644 --- a/libraries/import/xml.php +++ b/libraries/import/xml.php @@ -63,7 +63,7 @@ unset($data); * result in increased performance without the need to * 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);

hooks/post-receive