moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

navigation MDL-21604 Corrected simpletests after recent modifications

Browse source
This commit is contained in:
Sam Hemelryk 2010-02-18 06:42:29 +00:00
parent 507a7a9a2d
commit a3bbac8b76
2 changed files with 41 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/navigationlib.php
View file

@ -427,7 +427,7 @@ class navigation_node {
$link->add_class('dimmed');
}
$content = $OUTPUT->render($link);
} else if ($this->action instanceof moodle_url) {
$attributes = array();
if ($title !== '') {
@ -438,7 +438,7 @@ class navigation_node {
}
$content = html_writer::link($this->action, $content, $attributes);
} else if (is_string($this->action)) {
} else if (is_string($this->action) || empty($this->action)) {
$attributes = array();
if ($title !== '') {
$attributes['title'] = $title;
@ -2326,6 +2326,12 @@ class navbar extends navigation_node {
} else {
$output .= $this->parse_branch_to_html($this, true);
}
if (!empty($this->children)) {
// Add the custom children
$output .= $this->parse_branch_to_html($this->children, false, false);
}
$output .= html_writer::end_tag('ul');
$this->content = $output;
return $output;
@ -2392,11 +2398,6 @@ class navbar extends navigation_node {
}
}
if (!empty($this->children)) {
// Add the custom children
$output .= $this->parse_branch_to_html($this->children, false, false);
}
// XHTML
return $output;
}