mirror of
https://github.com/moodle/moodle.git
synced 2025-05-11 02:36:05 +02:00
MDL-19077 - fix a $CFG->pixpath problem.
This commit is contained in:
parent
f580b270f3
commit
48adf91aaf
@ -5352,7 +5352,7 @@ function admin_externalpage_print_footer() {
|
||||
* @return object admin_roow object
|
||||
*/
|
||||
function admin_get_root($reload=false, $requirefulltree=true) {
|
||||
global $CFG, $DB;
|
||||
global $CFG, $DB, $OUTPUT;
|
||||
|
||||
static $ADMIN = NULL;
|
||||
|
||||
@ -5365,6 +5365,9 @@ function admin_get_root($reload=false, $requirefulltree=true) {
|
||||
$ADMIN->purge_children($requirefulltree);
|
||||
}
|
||||
|
||||
// Some parts of the tree require $CFG->pixpath.
|
||||
$OUTPUT->initialise_deprecated_cfg_pixpath();
|
||||
|
||||
if (!$ADMIN->loaded) {
|
||||
// we process this file first to create categories first and in correct order
|
||||
require($CFG->dirroot.'/'.$CFG->admin.'/settings/top.php');
|
||||
|
Loading…
x
Reference in New Issue
Block a user