From 42a91a9d7f1ef0e6961c204a6b9f0d7f89505a9b Mon Sep 17 00:00:00 2001
From: Nathan Coad <nathan@thecoads.com>
Date: Fri, 13 Jul 2018 14:37:21 +1000
Subject: [PATCH] no need to add quote marks for excel output

---
 booking.variety_admin.inc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/booking.variety_admin.inc b/booking.variety_admin.inc
index 54a5de6..fc96f07 100644
--- a/booking.variety_admin.inc
+++ b/booking.variety_admin.inc
@@ -592,9 +592,9 @@ function booking_varietysessions_csv_report($timeslot_id) {
     //make the column headings a bit more user friendly
     $heading = $variety_sessions[$column]->booking_variety_descrip;
     //enclose $heading if necessary
-    if ( $encloseAll || preg_match( "/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $heading ) ) {
-      $heading = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $heading) . $enclosure;
-    }
+    //if ( $encloseAll || preg_match( "/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $heading ) ) {
+    //  $heading = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $heading) . $enclosure;
+    //}
 
     // Adjusted for excel, assume each column is just a string
     //$column_headings[] = array($heading => 'string');
@@ -612,12 +612,12 @@ function booking_varietysessions_csv_report($timeslot_id) {
       $field = isset($data[$column][$i]) ? $data[$column][$i] : '';
 
       //enclose $field if necessary
-      if ( $encloseAll || preg_match( "/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field ) ) {
-        $output[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $field) . $enclosure;
-      }
-      else {
+      //if ( $encloseAll || preg_match( "/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field ) ) {
+      //  $output[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $field) . $enclosure;
+      //}
+      //else {
         $output[] = $field;
-      }
+      //}
     } //loop through columns
     $rows[] = $output;
     //$row = implode($delimiter, $output) . "\n";