lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

if \n or \r we addquote too

Browse Source
This commit is contained in:
BENKE Charlie 2016-06-03 23:41:32 +02:00
parent 4226396da4
commit 41856a920e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/modules/export/export_csv.modules.php
View File

@ -307,9 +307,12 @@ class ExportCsv extends ModeleExports
//print $charset.' '.$newvalue."\n"; //print $charset.' '.$newvalue."\n";
// Rule 1 CSV: No CR, LF in cells // Rule 1 CSV: No CR, LF in cells
$oldvalue=$newvalue;
$newvalue=str_replace("\r",'',$newvalue); $newvalue=str_replace("\r",'',$newvalue);
$newvalue=str_replace("\n",'\n',$newvalue); $newvalue=str_replace("\n",'\n',$newvalue);
if($oldvalue != $newvalue)
$addquote=1;
// Rule 2 CSV: If value contains ", we must escape with ", and add " // Rule 2 CSV: If value contains ", we must escape with ", and add "
if (preg_match('/"/',$newvalue)) if (preg_match('/"/',$newvalue))
{ {