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

patch #2979234, bug #2960105 [import] Properly import unicode text from ODS.

Browse Source
This commit is contained in:
Nate
2010-03-31 14:25:08 +02:00
committed by Michal Čihař
parent 428ed49d17
commit 1e984375b6
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

@@ -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 #2978815 [pdf] Fix generating PDF with table dimensions, thanks to BlinK_
- patch #2977725 [export] XML wrongly encoded, thanks to Victor Volkov - hanut - patch #2977725 [export] XML wrongly encoded, thanks to Victor Volkov - hanut
- patch #2979234 [import] Create tables with current charset and collation. - 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) 3.3.1.0 (2010-03-16)
- bug #2941037 [core] Database structure not sorted by table correctly - bug #2941037 [core] Database structure not sorted by table correctly

2
libraries/import/ods.php
View File

@@ -68,7 +68,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);