Merge branch 'MDL-58833-master' of git://github.com/andrewnicols/moodle

moodle · May 10, 2017 · cb04995 · cb04995
2 parents a5ea94d + 89ab164
commit cb04995
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/admin/tool/templatelibrary/classes/api.php b/admin/tool/templatelibrary/classes/api.php
@@ -70,6 +70,9 @@ public static function list_templates($component = '', $search = '', $themename
             // Look at all the templates dirs for subsystems.
             $subsystems = core_component::get_core_subsystems();
             foreach ($subsystems as $subsystem => $dir) {
+                if (empty($dir)) {
+                    continue;
+                }
                 $dir .= '/templates';
                 if (is_dir($dir)) {
                     $dirs = mustache_template_finder::get_template_directories_for_component('core_' . $subsystem, $themename);