From efd8db8298bbf288ad596efd918661a3d3e8492d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@novell.com>
Date: Fri, 18 Mar 2011 15:36:04 +0100
Subject: [PATCH] bug #3208723 [import] Fix import of utf-8 XML files.

The string should be already in utf-8.
---
 ChangeLog                | 1 +
 libraries/import/xml.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e570b2142..89736735a 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 4984e45de..640aac811 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);