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

… MOODLE_34_STABLE
moodle · Jun 12, 2018 · cf482a6 · cf482a6
2 parents c1f3810 + fa141e4
commit cf482a6
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/lib/navigationlib.php b/lib/navigationlib.php
@@ -3983,6 +3983,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: