Permalink
Browse files

Merge branch 'MDL-59431-master-fix2' of git://github.com/andrewnicols…

…/moodle
  • Loading branch information...
dmonllao committed Jul 12, 2017
2 parents bd5416a + 0d8ad3b commit 5e961676c36c23e8da93375a694a9e65bc2966b8
Showing with 4 additions and 2 deletions.
  1. +4 −2 lib/requirejs.php
@@ -98,9 +98,11 @@
$content = '';
foreach ($jsfiles as $modulename => $jsfile) {
$js = file_get_contents($jsfile);
if ($jsfile === false) {
if ($js === false) {
error_log('Failed to load JavaScript file ' . $jsfile);
$js = '/* Failed to load JavaScript file ' . $jsfile . '. */';
$js = "/* Failed to load JavaScript file {$jsfile}. */\n";
$content = $js . $content;
continue;
}
$js .= "\n";
// Inject the module name into the define.

0 comments on commit 5e96167

Please sign in to comment.