allow just one character for "Fields enclosed by", thanks to Michal

This commit is contained in:
Marc Delisle
2008-01-30 13:13:37 +00:00
parent b1816db8fc
commit 82f7a341f1

View File

@@ -53,10 +53,12 @@ if (strlen($csv_terminated) != 1) {
// tend to remove the enclosing character on the Import dialog. // tend to remove the enclosing character on the Import dialog.
// I could not find a test case where having no enclosing characters // I could not find a test case where having no enclosing characters
// confuses this script. // confuses this script.
//} elseif (strlen($csv_enclosed) != 1) { // But the parser won't work correctly with strings so we allow just
// $message = PMA_Message::error('strInvalidCSVParameter'); // one character.
// $message->addParam('strFieldsEnclosedBy', false); } elseif (strlen($csv_enclosed) > 1) {
// $error = TRUE; $message = PMA_Message::error('strInvalidCSVParameter');
$message->addParam('strFieldsEnclosedBy', false);
$error = TRUE;
} elseif (strlen($csv_escaped) != 1) { } elseif (strlen($csv_escaped) != 1) {
$message = PMA_Message::error('strInvalidCSVParameter'); $message = PMA_Message::error('strInvalidCSVParameter');
$message->addParam('strFieldsEscapedBy', false); $message->addParam('strFieldsEscapedBy', false);