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

bug #1989281 [export] CSV for MS Excel incorrect escaping of double quotes

Browse Source
This commit is contained in:
Marc Delisle
2008-06-28 14:17:11 +00:00
parent 280de08922
commit 96adecc19b
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -75,6 +75,7 @@ danbarry
- bug #1992628 [parser] SQL parser removes essential space - bug #1992628 [parser] SQL parser removes essential space
- bug #1989281 [export] Export fails if one table is marked as crashed - bug #1989281 [export] Export fails if one table is marked as crashed
- bug #2001005 [GUI] ARCHIVE cannot have indexes - bug #2001005 [GUI] ARCHIVE cannot have indexes
- bug #1989281 [export] CSV for MS Excel incorrect escaping of double quotes
2.11.7.0 (2008-06-23) 2.11.7.0 (2008-06-23)
- bug #1908719 [interface] New field cannot be auto-increment and primary key - bug #1908719 [interface] New field cannot be auto-increment and primary key

10
libraries/export/csv.php
View File

@@ -184,9 +184,17 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
$schema_insert .= $row[$j]; $schema_insert .= $row[$j];
} else { } else {
// also double the escape string if found in the data // also double the escape string if found in the data
$schema_insert .= $csv_enclosed if ('csv' == $what) {
$schema_insert .= $csv_enclosed
. str_replace($csv_enclosed, $csv_escaped . $csv_enclosed, str_replace($csv_escaped, $csv_escaped . $csv_escaped, $row[$j])) . str_replace($csv_enclosed, $csv_escaped . $csv_enclosed, str_replace($csv_escaped, $csv_escaped . $csv_escaped, $row[$j]))
. $csv_enclosed; . $csv_enclosed;
} else {
// for excel, avoid a problem when a field contains
// double quotes
$schema_insert .= $csv_enclosed
. str_replace($csv_enclosed, $csv_escaped . $csv_enclosed, $row[$j])
. $csv_enclosed;
}
} }
} else { } else {
$schema_insert .= ''; $schema_insert .= '';