Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
integration
prechecker
Commits
39e7d46d
Commit
39e7d46d
authored
Nov 15, 2016
by
David Monllaó
Committed by
Dan Poltawski
Nov 15, 2016
Browse files
Merge branch 'MDL-56834-master-fix1' of
http://github.com/damyon/moodle
parents
2fd42372
cf199b44
Changes
1
Hide whitespace changes
Inline
Side-by-side
theme/boost/classes/output/core_renderer.php
View file @
39e7d46d
...
...
@@ -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.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment