Merge branch 'MDL-52966_static_cache_core_filetypes_get_types' of https://github.com/enovation/moodle

2018-12-17 15:38:09 +08:00
parent 4542981969 c126a29f5a
commit 8f65d27593
1 changed files with 2 additions and 5 deletions
@@ -337,16 +337,13 @@ abstract class core_filetypes {
        // Get defaults.
        $mimetypes = self::get_default_types();

-        // If there are no custom types, just return.
+        // Get custom file types.
        $custom = self::get_custom_types();
-        if (empty($custom)) {
-            return $mimetypes;
-        }

        // Check value is an array.
        if (!is_array($custom)) {
            debugging('Invalid $CFG->customfiletypes (not array)', DEBUG_DEVELOPER);
-            return $mimetypes;
+            $custom = array();
        }

        foreach ($custom as $customentry) {