1
0
mirror of https://github.com/moodle/moodle.git synced 2025-04-24 18:04:43 +02:00

Merge branch 'MDL-41565-master' of git://github.com/FMCorz/moodle

This commit is contained in:
Dan Poltawski 2013-09-10 15:21:49 +08:00
commit 4bdabf5968

@ -282,6 +282,7 @@ class manager {
if ($CFG->admin !== 'admin' and strpos($observer['includefile'], '/admin/') === 0) {
$observer['includefile'] = preg_replace('|^/admin/|', '/'.$CFG->admin.'/', $observer['includefile']);
}
$observer['includefile'] = $CFG->dirroot . '/' . ltrim($observer['includefile'], '/');
if (!file_exists($observer['includefile'])) {
debugging("Invalid 'includefile' detected in $file observer definition", DEBUG_DEVELOPER);
continue;