diff --git a/ChangeLog b/ChangeLog index 53ce2aa44..ada3d4de7 100644 --- a/ChangeLog +++ b/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, diff --git a/libraries/export/csv.php b/libraries/export/csv.php index 11c02edb9..6c639f776 100644 --- a/libraries/export/csv.php +++ b/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'])) { diff --git a/libraries/export/excel.php b/libraries/export/excel.php index 05700e27f..c01b91513 100644 --- a/libraries/export/excel.php +++ b/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',