Merge branch 'MDL-55283-30' of git://github.com/andrewnicols/moodle into MOODLE_30_STABLE

2016-07-26 05:05:07 +08:00
parent 329e98a621 4fdf0b226c
commit 44d7062228
1 changed files with 5 additions and 0 deletions
@@ -108,6 +108,11 @@ class core_requirejs {
            if ($debug) {
                $srcdir = $dir . '/src';
            }
+            if (!is_dir($srcdir) || !is_readable($srcdir)) {
+                // This is probably an empty amd directory without src or build.
+                // Skip it - RecursiveDirectoryIterator fatals if the directory is not readable as an iterator.
+                continue;
+            }
            $items = new RecursiveDirectoryIterator($srcdir);
            foreach ($items as $item) {
                $extension = $item->getExtension();