diff --git a/ChangeLog b/ChangeLog index 6d9310701..1f4a52c9c 100755 --- a/ChangeLog +++ b/ChangeLog @@ -17,7 +17,8 @@ $Source$ * sql.php: Do not compare db if not defined. * server_binlog.php, server_processlist.php: No need to grab all results to memory. - * libraries/export/htmlexcel.php: Fix extension. + * libraries/export/htmlexcel.php: Fix extension (bug #1497239). + * libraries/export/csv.php: Handle correctly AUTO (bug #1497239). 2006-05-29 Michal Čihař * lang/galician: Update, thanks to Xosé Calvo - xosecalvo. diff --git a/libraries/export/csv.php b/libraries/export/csv.php index f6098fd45..b97034824 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -70,7 +70,7 @@ function PMA_exportHeader() { $GLOBALS['cvs_columns'] = 'yes'; } } else { - if (empty($csv_terminated)) { + if (empty($csv_terminated) || strtolower($csv_terminated) == 'auto') { $csv_terminated = $GLOBALS['crlf']; } else { $csv_terminated = str_replace('\\r', "\015", $csv_terminated);