bug #2445213 [export] Commas for CSV Excel 2008 for Mac

ChangeLog

@@ -32,6 +32,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug [display] BIT field contents disappear when edited
 + [lang] Czech update, thanks to Ondřej Vadinský.
 - bug #2461735 [operations] Table operations adds "row_format"
+- bug #2445213 [export] Commas for CSV Excel 2008 for Mac
 
 3.1.1.0 (2008-12-09)
 - patch #2242765 [core] Navi panel server links wrong,

libraries/export/csv.php

@@ -69,7 +69,7 @@ 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' ? ';' : ',';
+        $csv_separator          = isset($GLOBALS['excel_edition']) && $GLOBALS['excel_edition'] == 'mac_excel2003' ? ';' : ',';
         $csv_enclosed           = '"';
         $csv_escaped            = '"';
         if (isset($GLOBALS['excel_columns'])) {

libraries/export/excel.php

@@ -21,7 +21,14 @@ if (isset($plugin_list)) {
         'options' => array(
             array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy'),
             array('type' => 'bool', 'name' => 'columns', 'text' => 'strPutColNames'),
-            array('type' => 'select', 'name' => 'edition', 'values' => array('win' => 'Windows', 'mac' => 'Excel 2003 / Macintosh'), 'text' => 'strExcelEdition'),
+            array(
+                'type' => 'select', 
+                'name' => 'edition', 
+                'values' => array(
+                    'win' => 'Windows',
+                    'mac_excel2003' => 'Excel 2003 / Macintosh', 
+                    'mac_excel2008' => 'Excel 2008 / Macintosh'), 
+                'text' => 'strExcelEdition'),
             array('type' => 'hidden', 'name' => 'data'),
             ),
         'options_text' => 'strOptions',