From: Antony Dovgal <tony2001@php.net>
Date: Fri, 18 Aug 2006 12:50:57 +0000 (+0000)
Subject: MFH: add a notice to fgetcsv() when delimiter or enclosure is longer than 1 char
X-Git-Tag: RELEASE_1_2_2~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a33913d96050d4266c93b5ac1b7e3e23ca473fb3;p=php

MFH: add a notice to fgetcsv() when delimiter or enclosure is longer than 1 char
(feature request #38496)
---

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];
 		}