Merge branch 'MDL-53687-31' of git://github.com/FMCorz/moodle into MO…

…ODLE_31_STABLE
moodle · May 24, 2016 · 98e4407 · 98e4407
2 parents 48e0814 + 025e984
commit 98e4407
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/medialib.php b/lib/medialib.php
@@ -1123,8 +1123,8 @@ public function list_supported_urls(array $urls, array $options = array()) {
                 // is a simplified version, does not take into account old browser
                 // versions or manual plugins.
                 if ($ext === 'ogv' || $ext === 'webm') {
-                    // Formats .ogv and .webm are not supported in IE or Safari.
-                    if (core_useragent::is_ie() || core_useragent::is_safari()) {
+                    // Formats .ogv and .webm are not supported in IE, Edge or Safari.
+                    if (core_useragent::is_ie() || core_useragent::is_edge() || core_useragent::is_safari()) {
                         continue;
                     }
                 } else {
@@ -1196,7 +1196,7 @@ public function list_supported_urls(array $urls, array $options = array()) {
             if (in_array($ext, $extensions)) {
                 if ($ext === 'ogg' || $ext === 'oga') {
                     // Formats .ogg and .oga are not supported in IE or Safari.
-                    if (core_useragent::is_ie() || core_useragent::is_safari()) {
+                    if (core_useragent::is_ie() || core_useragent::is_edge() || core_useragent::is_safari()) {
                         continue;
                     }
                 } else {