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

Handle correctly AUTO (bug #1497239).

Browse Source
This commit is contained in:
Michal Čihař
2006-05-30 13:46:13 +00:00
parent c8eaea4e22
commit af54eb141e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -17,7 +17,8 @@ $Source$
* sql.php: Do not compare db if not defined. * sql.php: Do not compare db if not defined.
* server_binlog.php, server_processlist.php: No need to grab all results * server_binlog.php, server_processlist.php: No need to grab all results
to memory. 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ř <michal@cihar.com> 2006-05-29 Michal Čihař <michal@cihar.com>
* lang/galician: Update, thanks to Xosé Calvo - xosecalvo. * lang/galician: Update, thanks to Xosé Calvo - xosecalvo.

2
libraries/export/csv.php
View File

@@ -70,7 +70,7 @@ function PMA_exportHeader() {
$GLOBALS['cvs_columns'] = 'yes'; $GLOBALS['cvs_columns'] = 'yes';
} }
} else { } else {
if (empty($csv_terminated)) { if (empty($csv_terminated) || strtolower($csv_terminated) == 'auto') {
$csv_terminated = $GLOBALS['crlf']; $csv_terminated = $GLOBALS['crlf'];
} else { } else {
$csv_terminated = str_replace('\\r', "\015", $csv_terminated); $csv_terminated = str_replace('\\r', "\015", $csv_terminated);