Merge remote branch 'origin/master'

ChangeLog

@@ -71,6 +71,9 @@ $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.
+- bug #2973280 [export] Proper handling of temporary directory in XLS export.
 
 3.3.1.0 (2010-03-16)
 - bug #2941037 [core] Database structure not sorted by table correctly 

libraries/export/xls.php

@@ -59,6 +59,7 @@ function PMA_exportFooter() {
     $tmp_filename = tempnam(realpath($GLOBALS['cfg']['TempDir']), 'pma_xls_');
     
     $workbookWriter = new PHPExcel_Writer_Excel5($workbook);
+    $workbookWriter->setTempDir(realpath($GLOBALS['cfg']['TempDir']));
     $workbookWriter->save($tmp_filename);
     
     if (!PMA_exportOutputHandler(file_get_contents($tmp_filename))) {

libraries/export/xlsx.php

@@ -59,6 +59,7 @@ function PMA_exportFooter() {
     $tmp_filename = tempnam(realpath($GLOBALS['cfg']['TempDir']), 'pma_xlsx_');
 
     $workbookWriter = new PHPExcel_Writer_Excel2007($workbook);
+    $workbookWriter->setTempDir(realpath($GLOBALS['cfg']['TempDir']));
     $workbookWriter->save($tmp_filename);
 
     if (!PMA_exportOutputHandler(file_get_contents($tmp_filename))) {

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

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);