diff options
| author | Antony Dovgal <tony2001@php.net> | 2006-08-18 12:50:57 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2006-08-18 12:50:57 +0000 |
| commit | a33913d96050d4266c93b5ac1b7e3e23ca473fb3 (patch) | |
| tree | c510c482f13683c5c26fe2ce356dae789502f801 | |
| parent | 92963d12a653c4d6c9afc8959bff36d0b4ded564 (diff) | |
| download | php-git-a33913d96050d4266c93b5ac1b7e3e23ca473fb3.tar.gz | |
MFH: add a notice to fgetcsv() when delimiter or enclosure is longer than 1 char
(feature request #38496)
| -rw-r--r-- | ext/standard/file.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/standard/file.c b/ext/standard/file.c index 0bbb23f48c..f998278752 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -2003,6 +2003,8 @@ PHP_FUNCTION(fgetcsv) if (delimiter_str_len < 1) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "delimiter must be a character"); RETURN_FALSE; + } else if (delimiter_str_len > 1) { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "delimiter must be a single character"); } /* use first character from string */ @@ -2013,7 +2015,10 @@ PHP_FUNCTION(fgetcsv) if (enclosure_str_len < 1) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "enclosure must be a character"); RETURN_FALSE; + } else if (enclosure_str_len > 1) { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "enclosure must be a single character"); } + /* use first character from string */ enclosure = enclosure_str[0]; } |