Merge branch 'MDL-33780_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

2012-07-02 16:07:32 +08:00
parent ed8cab855e 5af6c9676e
commit 9a211c853d
1 changed files with 4 additions and 1 deletions
@@ -539,7 +539,10 @@ class qformat_default {
        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 {