Merge branch 'wip-MDL-37290-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE

2012-12-24 10:55:46 +08:00
parent 7f44175aed 5c6c90e3c8
commit 1453ae5bf3
1 changed files with 1 additions and 0 deletions
@@ -191,6 +191,7 @@ if ($editingon && can_edit_in_category()) {
    // Integrate into the admin tree only if the user can edit categories at the top level,
    // otherwise the admin block does not appear to this user, and you get an error.
    require_once($CFG->libdir . '/adminlib.php');
+    navigation_node::override_active_url(new moodle_url('/course/category.php', array('id' => $id)));
    admin_externalpage_setup('coursemgmt', '', $urlparams, $CFG->wwwroot . '/course/category.php');
    $PAGE->set_context($context);   // Ensure that we are actually showing blocks etc for the cat context