Permalink
Browse files

Merge branch 'MDL-33780_22' of git://github.com/timhunt/moodle into M…

…OODLE_22_STABLE
  • Loading branch information...
2 parents 1693774 + f4bd9d3 commit 4769b04283bf2fd96a247dea0666cceefcf1ba06 @danpoltawski danpoltawski committed Jul 2, 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::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 4769b04

Please sign in to comment.