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

2013-09-10 15:21:49 +08:00
parent f2ee9b5c27 28f1ff8def
commit 4bdabf5968
1 changed files with 1 additions and 0 deletions
@@ -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;