mirror of
https://github.com/moodle/moodle.git
synced 2025-01-18 22:08:20 +01:00
navigation MDL-14632 Fixed navbar bug whereby if no active pages were found in either navigation or settings
`home` was not added to the navbar
This commit is contained in:
parent
035b6a5d01
commit
72b3485eab
@ -1860,8 +1860,9 @@ class navbar extends navigation_node {
|
||||
} else if ($this->page->settingsnav->contains_active_node()) {
|
||||
// Parse the settings navigation to get the active node
|
||||
$output .= $this->parse_branch_to_html($this->page->settingsnav->children, true, $customchildren);
|
||||
} else {
|
||||
$output .= $this->parse_branch_to_html($this, true, $customchildren);
|
||||
}
|
||||
|
||||
// Check if there are any children added by code
|
||||
if ($customchildren) {
|
||||
// Add the custom children
|
||||
@ -1887,6 +1888,7 @@ class navbar extends navigation_node {
|
||||
$output .= '<li class="first">'.parent::content(true).'</li>';
|
||||
}
|
||||
$count = 0;
|
||||
if (!is_array($navarray)) return $output;
|
||||
// Iterate the navarray and display each node
|
||||
while (count($navarray)>0) {
|
||||
// Sanity check make sure we don't display WAY too much information
|
||||
|
Loading…
x
Reference in New Issue
Block a user