From 82f7a341f1130ae198cf381e3bbed4b296e699ec Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 30 Jan 2008 13:13:37 +0000 Subject: [PATCH] allow just one character for "Fields enclosed by", thanks to Michal --- libraries/import/csv.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libraries/import/csv.php b/libraries/import/csv.php index 248e030ec..c84da1f64 100644 --- a/libraries/import/csv.php +++ b/libraries/import/csv.php @@ -53,10 +53,12 @@ if (strlen($csv_terminated) != 1) { // 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 = PMA_Message::error('strInvalidCSVParameter'); -// $message->addParam('strFieldsEnclosedBy', false); -// $error = TRUE; + // But the parser won't work correctly with strings so we allow just + // one character. +} elseif (strlen($csv_enclosed) > 1) { + $message = PMA_Message::error('strInvalidCSVParameter'); + $message->addParam('strFieldsEnclosedBy', false); + $error = TRUE; } elseif (strlen($csv_escaped) != 1) { $message = PMA_Message::error('strInvalidCSVParameter'); $message->addParam('strFieldsEscapedBy', false);