From d44bdfb0686f01d4bf1006a55cb22622a0a4b16b Mon Sep 17 00:00:00 2001
From: Jonathan Harker <jonathan@catalyst.net.nz>
Date: Tue, 20 Jul 2010 03:19:49 +0000
Subject: [PATCH] course/import/groups: MDL-20876 Fix split() call and remove
 redundant escaping.

---
 course/import/groups/index.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/course/import/groups/index.php b/course/import/groups/index.php
index 55f4401cbc4..7c40cb49632 100755
--- a/course/import/groups/index.php
+++ b/course/import/groups/index.php
@@ -72,15 +72,13 @@ die;
 } else {
     $csv_encode = '/\&\#44/';
     if (isset($CFG->CSV_DELIMITER)) {
-        $csv_delimiter = '\\' . $CFG->CSV_DELIMITER;
-        $csv_delimiter2 = $CFG->CSV_DELIMITER;
+        $csv_delimiter = $CFG->CSV_DELIMITER;
 
         if (isset($CFG->CSV_ENCODE)) {
             $csv_encode = '/\&\#' . $CFG->CSV_ENCODE . '/';
         }
     } else {
-        $csv_delimiter = "\,";
-        $csv_delimiter2 = ",";
+        $csv_delimiter = ",";
     }
 
     // prepare temp file
@@ -107,7 +105,7 @@ die;
             "hidepicture" => 1);
 
     // --- get header (field names) ---
-    $header = split($csv_delimiter, fgets($fp,1024));
+    $header = explode($csv_delimiter, fgets($fp,1024));
     // check for valid field names
     foreach ($header as $i => $h) {
         $h = trim($h); $header[$i] = $h; // remove whitespace
@@ -136,10 +134,10 @@ die;
         }
         //Note: commas within a field should be encoded as &#44 (for comma separated csv files)
         //Note: semicolon within a field should be encoded as &#59 (for semicolon separated csv files)
-        $line = split($csv_delimiter, fgets($fp,1024));
+        $line = explode($csv_delimiter, fgets($fp,1024));
         foreach ($line as $key => $value) {
             //decode encoded commas
-            $record[$header[$key]] = preg_replace($csv_encode,$csv_delimiter2,trim($value));
+            $record[$header[$key]] = preg_replace($csv_encode,$csv_delimiter,trim($value));
         }
         if ($record[$header[0]]) {
             // add a new group to the database