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

… MOODLE_35_STABLE
moodle · Jun 12, 2018 · 334ced71a1308d52b166b979fa22f844cf402db5 · 334ced7
2 parents f3a817e + 0ff993f
commit 334ced71a1308d52b166b979fa22f844cf402db5
Unified Split

Showing with 1 addition and 0 deletions.

+1 −0 lib/navigationlib.php
diff --git a/lib/navigationlib.php b/lib/navigationlib.php
@@ -3988,6 +3988,7 @@ public function initialise() {
        if ($context->contextlevel == CONTEXT_BLOCK) {
            $this->load_block_settings();
            $context = $context->get_parent_context();
+            $this->context = $context;
        }
        switch ($context->contextlevel) {
            case CONTEXT_SYSTEM: