MDL-19077 - fix a $CFG->pixpath problem.

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 2751eb138b34b37ace899a7ee546b413598d6c58..40cdfc89bd46a37a2fe80adf48c3e5b33438fbaa 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -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');