From 6260bb0f8f8486b855abc57fe418ac55285001fa Mon Sep 17 00:00:00 2001 From: eileen Date: Mon, 25 Nov 2019 17:41:47 +1300 Subject: [PATCH] Remove enclosed variable. Given that it can only ever be a double quote parameterizing it is only confusing --- CRM/Core/Report/Excel.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CRM/Core/Report/Excel.php b/CRM/Core/Report/Excel.php index 127f23e5c4..b4b3affb7c 100644 --- a/CRM/Core/Report/Excel.php +++ b/CRM/Core/Report/Excel.php @@ -40,13 +40,11 @@ class CRM_Core_Report_Excel { $config = CRM_Core_Config::singleton(); $seperator = $config->fieldSeparator; - $enclosed = '"'; - $escaped = $enclosed; $add_character = "\015\012"; $schema_insert = ''; foreach ($header as $field) { - $schema_insert .= $enclosed . str_replace($enclosed, $escaped . $enclosed, stripslashes($field)) . $enclosed; + $schema_insert .= '"' . str_replace('"', '""', stripslashes($field)) . '"'; $schema_insert .= $seperator; } // end while @@ -87,7 +85,7 @@ class CRM_Core_Report_Excel { $value = &$str; } - $schema_insert .= $enclosed . str_replace($enclosed, $escaped . $enclosed, $value) . $enclosed; + $schema_insert .= '"' . str_replace('"', '""', $value) . '"'; } if ($colNo < $fields_cnt - 1) { -- 2.25.1