diff --git a/parsecsv.lib.php b/parsecsv.lib.php index 2d9916b..433faed 100644 --- a/parsecsv.lib.php +++ b/parsecsv.lib.php @@ -973,7 +973,7 @@ class parseCSV { $delimiter_quoted = preg_quote($delimiter, '/'); $enclosure_quoted = preg_quote($this->enclosure, '/'); $pattern = "/" . $delimiter_quoted . "|" . $enclosure_quoted . "|\n|\r/i"; - if (preg_match($pattern, $value) || ($value{0} == ' ' || substr($value, -1) == ' ') || $this->enclose_all) { + if ($this->enclose_all || preg_match($pattern, $value) || ($value{0} == ' ' || substr($value, -1) == ' ')) { $value = str_replace($this->enclosure, $this->enclosure . $this->enclosure, $value); $value = $this->enclosure . $value . $this->enclosure; }