From cf199b44486a7e04a9bf84d4fafccf944f673b1e Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Mon, 14 Nov 2016 17:16:38 +0800 Subject: [PATCH] MDL-56834 boost: Be cautious about nodes in the navbar Some pages (fresh install) don't have the navbar yet, so check for null. --- theme/boost/classes/output/core_renderer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/theme/boost/classes/output/core_renderer.php b/theme/boost/classes/output/core_renderer.php index 47181377228..48da10b7b1e 100644 --- a/theme/boost/classes/output/core_renderer.php +++ b/theme/boost/classes/output/core_renderer.php @@ -619,7 +619,7 @@ class core_renderer extends \core_renderer { $navbarnode = end($items); // We only want to show the menu on the first page of the activity. This means // the breadcrumb has no additional nodes. - if ($navbarnode->key == $node->key && $navbarnode->type == $node->type) { + if ($navbarnode && ($navbarnode->key == $node->key && $navbarnode->type == $node->type)) { $buildmenu = true; } } @@ -635,7 +635,7 @@ class core_renderer extends \core_renderer { $items = $this->page->navbar->get_items(); $navbarnode = end($items); - if ($navbarnode->key == 'participants') { + if ($navbarnode && ($navbarnode->key == 'participants')) { $node = $this->page->settingsnav->find('users', navigation_node::TYPE_CONTAINER); if ($node) { // Build an action menu based on the visible nodes from this navigation tree.