From 41856a920e17b6eb1bb39e393c712b8cea137532 Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Fri, 3 Jun 2016 23:41:32 +0200 Subject: [PATCH] if \n or \r we addquote too --- htdocs/core/modules/export/export_csv.modules.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/core/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php index e8977c11789..83de884e7c3 100644 --- a/htdocs/core/modules/export/export_csv.modules.php +++ b/htdocs/core/modules/export/export_csv.modules.php @@ -307,9 +307,12 @@ class ExportCsv extends ModeleExports //print $charset.' '.$newvalue."\n"; // Rule 1 CSV: No CR, LF in cells + $oldvalue=$newvalue; $newvalue=str_replace("\r",'',$newvalue); $newvalue=str_replace("\n",'\n',$newvalue); - + if($oldvalue != $newvalue) + $addquote=1; + // Rule 2 CSV: If value contains ", we must escape with ", and add " if (preg_match('/"/',$newvalue)) {