Merge branch 'MDL-58063-35' of git://github.com/mihailges/moodle into MOODLE_35_STABLE

2018-06-12 11:05:47 +02:00
parent f3a817e959 0ff993ffe3
commit 334ced71a1
1 changed files with 1 additions and 0 deletions
@@ -3988,6 +3988,7 @@ class settings_navigation extends navigation_node {
        if ($context->contextlevel == CONTEXT_BLOCK) {
            $this->load_block_settings();
            $context = $context->get_parent_context();
+            $this->context = $context;
        }
        switch ($context->contextlevel) {
            case CONTEXT_SYSTEM: