[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1144-g07eca26

[Michal Čihař]

The branch, master has been updated
       via  07eca26675e2b5d3ddb0d771fa198e3d186b3073 (commit)
       via  1e984375b6ab0253b8c1860b55a11e705be772c0 (commit)
       via  428ed49d17533adb5444d85e8b194883fea99bb5 (commit)
      from  7b754395e9b2fa7eb231f6aedb6ba88f9be55925 (commit)


- Log -----------------------------------------------------------------
commit 07eca26675e2b5d3ddb0d771fa198e3d186b3073
Merge: 7b754395e9b2fa7eb231f6aedb6ba88f9be55925 1e984375b6ab0253b8c1860b55a11e705be772c0
Author: Michal Čihař <mcihar at novell.com>
Date:   Wed Mar 31 14:26:08 2010 +0200

    Merge branch 'QA_3_3'

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

Summary of changes:
 ChangeLog                |    2 ++
 libraries/import.lib.php |    2 +-
 libraries/import/ods.php |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 165dd4f..1f37695 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -71,6 +71,8 @@ $Id$
   thanks to Kaarel Nummert - kaarelnu
 - 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.lib.php b/libraries/import.lib.php
index 9d2ccd2..8ef3249 100644
--- a/libraries/import.lib.php
+++ b/libraries/import.lib.php
@@ -938,7 +938,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql =
                     $tempSQLStr .= ", ";
                 }
             }
-            $tempSQLStr .= ") ENGINE=MyISAM;";
+            $tempSQLStr .= ") ENGINE=MyISAM DEFAULT CHARACTER SET " . $charset . " COLLATE " . $collation . ";";
             
             /**
              * Each SQL statement is executed immediately
diff --git a/libraries/import/ods.php b/libraries/import/ods.php
index 89701ec..81aed5e 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);
 


hooks/post-receive
-- 
phpMyAdmin