diff --git a/ChangeLog b/ChangeLog index 1b2f475d5..0b902cebd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - patch #2978815 [pdf] Fix generating PDF with table dimensions, thanks to BlinK_ - patch #2977725 [export] XML wrongly encoded, thanks to Victor Volkov - hanut - patch #2979234 [import] Create tables with current charset and collation. +- patch #2979234, bug #2960105 [import] Properly import unicode text from ODS. 3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/libraries/import/ods.php b/libraries/import/ods.php index 89701ec19..81aed5e20 100644 --- a/libraries/import/ods.php +++ b/libraries/import/ods.php @@ -68,7 +68,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);