Merge branch 'QA_3_3'

ChangeLog

@@ -100,6 +100,7 @@ $Id$
 - bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from
 master, todo: update PHP excel?)
 - bug #3023507 [core] No result set display from stored procedure SELECT
+- bug [export] CSV for MS Excel (Windows) should have semi-colon as separator
 
 3.3.4.0 (2010-06-28)
 - bug #2996161 [import] properly escape import value

libraries/export/csv.php

@@ -70,7 +70,18 @@ function PMA_exportHeader() {
     // Here we just prepare some values for export
     if ($what == 'excel') {
         $csv_terminated      = "\015\012";
-        $csv_separator          = isset($GLOBALS['excel_edition']) && $GLOBALS['excel_edition'] == 'mac_excel2003' ? ';' : ',';
+        switch($GLOBALS['excel_edition']) {
+        case 'win':
+            // as tested on Windows with Excel 2002 and Excel 2007
+            $csv_separator = ';';
+            break;
+        case 'max_excel2003':
+            $csv_separator = ';';
+            break;
+        case 'max_excel2008':
+            $csv_separator = ',';
+            break;
+        }
         $csv_enclosed           = '"';
         $csv_escaped            = '"';
         if (isset($GLOBALS['excel_columns'])) {