_enclose_value

This commit is contained in:
William Knauss
2014-06-05 20:50:48 -04:00
parent 6f4d150e6f
commit 0422d5d9fe

View File

@@ -1066,13 +1066,13 @@ class parseCSV {
* @return Processed value
*/
protected function _enclose_value ($value = null, $delimiter = null) {
if ( $delimiter === null ) {
if (is_null($delimiter)) {
$delimiter = $this->delimiter;
}
if ( $value !== null && $value != '' ) {
if ($value !== null && $value != '') {
$delimiter_quoted = preg_quote($delimiter, '/');
$enclosure_quoted = preg_quote($this->enclosure, '/');
if ( preg_match("/".$delimiter_quoted."|".$enclosure_quoted."|\n|\r/i", $value) || ($value{0} == ' ' || substr($value, -1) == ' ') || $this->enclose_all ) {
if (preg_match("/".$delimiter_quoted."|".$enclosure_quoted."|\n|\r/i", $value) || ($value{0} == ' ' || substr($value, -1) == ' ') || $this->enclose_all) {
$value = str_replace($this->enclosure, $this->enclosure.$this->enclosure, $value);
$value = $this->enclosure.$value.$this->enclosure;
}