Merge branch 'MDL-69061-39' of https://github.com/junpataleta/moodle into MOODLE_39_STABLE

This commit is contained in:
Jun Pataleta
2022-01-11 11:56:29 +08:00
+2 -2
View File
@@ -440,7 +440,7 @@ $cache = '.var_export($cache, true).';
$path = $CFG->admin;
}
if (strpos($path, 'admin/') === 0) {
$path = $CFG->admin . substr($path, 0, 5);
$path = $CFG->admin . substr($path, 5);
}
}
@@ -461,7 +461,7 @@ $cache = '.var_export($cache, true).';
foreach (self::fetch_component_source('plugintypes') as $plugintype => $path) {
// Replace admin/ with the config setting.
if ($CFG->admin !== 'admin' && strpos($path, 'admin/') === 0) {
$path = $CFG->admin . substr($path, 0, 5);
$path = $CFG->admin . substr($path, 5);
}
$types[$plugintype] = "{$CFG->dirroot}/{$path}";
}