Skip to content
Browse files

MDL-33780 question import: strip UTF8 BOM

Previously, if there was a byte-order mark at the start of the file, the
import would just break, which was silly. Much better to just strip it
off.
  • Loading branch information...
1 parent 3546266 commit 81200053af605ad6c75e2ddcbaf7f2c7f9ec4655 @timhunt timhunt committed Jun 18, 2012
Showing with 4 additions and 1 deletion.
  1. +4 −1 question/format.php
View
5 question/format.php
@@ -539,7 +539,10 @@ protected function readdata($filename) {
if (is_readable($filename)) {
$filearray = file($filename);
- /// Check for Macintosh OS line returns (ie file on one line), and fix
+ // If the first line of the file starts with a UTF-8 BOM, remove it.
+ $filearray[0] = textlib_get_instance()->trim_utf8_bom($filearray[0]);
+
+ // Check for Macintosh OS line returns (ie file on one line), and fix.
if (preg_match("~\r~", $filearray[0]) AND !preg_match("~\n~", $filearray[0])) {
return explode("\r", $filearray[0]);
} else {

0 comments on commit 8120005

Please sign in to comment.
Something went wrong with that request. Please try again.