Merge branch 'wip_MDL-46728_master' of git://github.com/gjb2048/moodle

2015-02-03 11:45:15 +08:00
parent 9afe4eb556 eb1861983a
commit a5b4cc9635
1 changed files with 5 additions and 1 deletions
@@ -57,7 +57,11 @@ if (empty($component) or $component === 'moodle' or $component === 'core') {
    $component = 'core';
 }

-if (preg_match('/^[a-z0-9_-]+\.woff$/i', $font, $matches)) {
+if (preg_match('/^[a-z0-9_-]+\.woff2$/i', $font, $matches)) {
+    $font = $matches[0];
+    $mimetype = 'application/font-woff2';
+
+} else if (preg_match('/^[a-z0-9_-]+\.woff$/i', $font, $matches)) {
    // This is the real standard!
    $font = $matches[0];
    $mimetype = 'application/font-woff';