Merge branch 'w30_MDL-23493_m26_fonts' of https://github.com/skodak/moodle
This commit is contained in:
+3
-3
@@ -62,15 +62,15 @@ if (preg_match('/^[a-z0-9_-]+\.woff$/i', $font, $matches)) {
|
||||
$font = $matches[0];
|
||||
$mimetype = 'application/font-woff';
|
||||
|
||||
} else if (preg_match('^[a-z0-9_-]+/\.ttf$/i', $font, $matches)) {
|
||||
} else if (preg_match('/^[a-z0-9_-]+\.ttf$/i', $font, $matches)) {
|
||||
$font = $matches[0];
|
||||
$mimetype = 'application/x-font-ttf';
|
||||
|
||||
} else if (preg_match('^[a-z0-9_-]+/\.otf$/i', $font, $matches)) {
|
||||
} else if (preg_match('/^[a-z0-9_-]+\.otf$/i', $font, $matches)) {
|
||||
$font = $matches[0];
|
||||
$mimetype = 'application/x-font-opentype';
|
||||
|
||||
} else if (preg_match('^[a-z0-9_-]+/\.oet$/i', $font, $matches)) {
|
||||
} else if (preg_match('/^[a-z0-9_-]+\.oet$/i', $font, $matches)) {
|
||||
// IE8 must die!!!
|
||||
$font = $matches[0];
|
||||
$mimetype = 'application/vnd.ms-fontobject';
|
||||
|
||||
Reference in New Issue
Block a user