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

bug [import] Do not verify a missing enclosing character for CSV

Browse Source
This commit is contained in:
Marc Delisle
2008-01-29 18:05:59 +00:00
parent 55a163dfeb
commit 98f9967a61
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -16,6 +16,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #1875010 [auth] MySQL server and client version mismatch (mysql ext.) - bug #1875010 [auth] MySQL server and client version mismatch (mysql ext.)
- patch #1879031 [transform] dateformat transformation and UNIX timestamps, - patch #1879031 [transform] dateformat transformation and UNIX timestamps,
thanks to Tim Steiner - spam38 thanks to Tim Steiner - spam38
- bug [import] Do not verify a missing enclosing character for CSV,
because files generated by Excel don't have any enclosing character
2.11.4.0 (2008-01-12) 2.11.4.0 (2008-01-12)
- bug #1843428 [GUI] Space issue with DROP/DELETE/ALTER TABLE - bug #1843428 [GUI] Space issue with DROP/DELETE/ALTER TABLE

14
libraries/import/csv.php
View File

@@ -47,10 +47,16 @@ if (strlen($csv_terminated) != 1) {
$message = sprintf($strInvalidCSVParameter, $strFieldsTerminatedBy); $message = sprintf($strInvalidCSVParameter, $strFieldsTerminatedBy);
$show_error_header = TRUE; $show_error_header = TRUE;
$error = TRUE; $error = TRUE;
} elseif (strlen($csv_enclosed) != 1) { // The default dialog of MS Excel when generating a CSV produces a
$message = sprintf($strInvalidCSVParameter, $strFieldsEnclosedBy); // semi-colon-separated file with no chance of specifying the
$show_error_header = TRUE; // enclosing character. Thus, users who want to import this file
$error = TRUE; // tend to remove the enclosing character on the Import dialog.
// I could not find a test case where having no enclosing characters
// confuses this script.
//} elseif (strlen($csv_enclosed) != 1) {
// $message = sprintf($strInvalidCSVParameter, $strFieldsEnclosedBy);
// $show_error_header = TRUE;
// $error = TRUE;
} elseif (strlen($csv_escaped) != 1) { } elseif (strlen($csv_escaped) != 1) {
$message = sprintf($strInvalidCSVParameter, $strFieldsEscapedBy); $message = sprintf($strInvalidCSVParameter, $strFieldsEscapedBy);
$show_error_header = TRUE; $show_error_header = TRUE;