Merge branch 'w36_MDL-35168_m23_yuipath' of git://github.com/skodak/moodle into MOODLE_23_STABLE

This commit is contained in:
Eloy Lafuente (stronk7) 2012-09-03 17:16:17 +02:00
commit a31d7a0ed3

View file

@ -109,7 +109,8 @@ foreach ($parts as $part) {
$contentfile = "$CFG->libdir/yui/$part";
}
if (!file_exists($contentfile) or !is_file($contentfile)) {
$content .= "\n// Combo resource $part ($contentfile) not found!\n";
$location = '$CFG->dirroot'.preg_replace('/^'.preg_quote($CFG->dirroot, '/').'/', '', $contentfile);
$content .= "\n// Combo resource $part ($location) not found!\n";
continue;
}
$filecontent = file_get_contents($contentfile);