Merge branch 'MDL-72432-master' of https://github.com/katerynadegtyar…

…iova/moodle
crazyserver · Sep 15, 2021 · c60ea2c · c60ea2c
2 parents f1416b6 + b25e173
commit c60ea2c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/group/import.php b/group/import.php
@@ -61,8 +61,6 @@
     $text = $importform->get_file_content('userfile');
     $text = preg_replace('!\r\n?!', "\n", $text);
 
-    $rawlines = explode("\n", $text);
-
     require_once($CFG->libdir . '/csvlib.class.php');
     $importid = csv_import_reader::get_new_iid('groupimport');
     $csvimport = new csv_import_reader($importid, 'groupimport');
@@ -95,7 +93,9 @@
         );
 
     // --- get header (field names) ---
-    $header = explode($csvimport::get_delimiter($delimiter), array_shift($rawlines));
+    // Using get_columns() ensures the Byte Order Mark is removed.
+    $header = $csvimport->get_columns();
+
     // check for valid field names
     foreach ($header as $i => $h) {
         $h = trim($h); $header[$i] = $h; // remove whitespace