nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_3_3'

Browse Source
This commit is contained in:
Marc Delisle
2010-07-12 08:57:05 -04:00
parent ce2cad2886 cda9df7101
commit f6ef0c87a8
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -100,6 +100,7 @@ $Id$
- bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from - bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from
master, todo: update PHP excel?) master, todo: update PHP excel?)
- bug #3023507 [core] No result set display from stored procedure SELECT - 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) 3.3.4.0 (2010-06-28)
- bug #2996161 [import] properly escape import value - bug #2996161 [import] properly escape import value

13
libraries/export/csv.php
View File

@@ -70,7 +70,18 @@ function PMA_exportHeader() {
// Here we just prepare some values for export // Here we just prepare some values for export
if ($what == 'excel') { if ($what == 'excel') {
$csv_terminated = "\015\012"; $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_enclosed = '"';
$csv_escaped = '"'; $csv_escaped = '"';
if (isset($GLOBALS['excel_columns'])) { if (isset($GLOBALS['excel_columns'])) {