Commit 39e7d46d authored by David Monllaó's avatar David Monllaó Committed by Dan Poltawski
Browse files

Merge branch 'MDL-56834-master-fix1' of http://github.com/damyon/moodle

parents 2fd42372 cf199b44
......@@ -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.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment