parsecsv/parsecsv-for-php
1
0
Fork 0
mirror of https://github.com/parsecsv/parsecsv-for-php.git synced 2026-02-19 08:36:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent quoting of sinlge-column file. Needed because auto() with...

Browse Source 
...single-column file will not set field delimiter. This commit is a bug fix.

For a test see testSaveWithDefaultSettings.
This commit is contained in:
Christian Bläul
2018-01-21 16:38:05 +01:00
committed by Fonata
parent 54e846ee30
commit a92506d078
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
parsecsv.lib.php
View File

@@ -980,19 +980,18 @@ class parseCSV {
* Enclose values if needed * Enclose values if needed
* - only used by unparse() * - only used by unparse()
* *
* @param string $value Cell value to process * @param string $value Cell value to process
* @param string|null $delimiter * @param string $delimiter Character to put between fields
* *
* @return string Processed value * @return string Processed value
*/ */
protected function _enclose_value($value = null, $delimiter = null) { protected function _enclose_value($value = null, $delimiter) {
if (is_null($delimiter)) {
$delimiter = $this->delimiter;
}
if ($value !== null && $value != '') { if ($value !== null && $value != '') {
$delimiter_quoted = preg_quote($delimiter, '/'); $delimiter_quoted = $delimiter ?
preg_quote($delimiter, '/') . "|"
: '';
$enclosure_quoted = preg_quote($this->enclosure, '/'); $enclosure_quoted = preg_quote($this->enclosure, '/');
$pattern = "/" . $delimiter_quoted . "|" . $enclosure_quoted . "|\n|\r/i"; $pattern = "/" . $delimiter_quoted . $enclosure_quoted . "|\n|\r/i";
if ($this->enclose_all || preg_match($pattern, $value) || ($value{0} == ' ' || substr($value, -1) == ' ')) { if ($this->enclose_all || preg_match($pattern, $value) || ($value{0} == ' ' || substr($value, -1) == ' ')) {
$value = str_replace($this->enclosure, $this->enclosure . $this->enclosure, $value); $value = str_replace($this->enclosure, $this->enclosure . $this->enclosure, $value);
$value = $this->enclosure . $value . $this->enclosure; $value = $this->enclosure . $value . $this->enclosure;