Merge branch MDL-29186-m21 of git://github.com/samhemelryk/moodle

- resolved conflicts, minor whitespace and fixed quote.
    - note: textlib_get_instance() is already deprecated
This commit is contained in:
Aparup Banerjee
2011-09-13 16:19:47 +08:00
31 changed files with 102 additions and 56 deletions
+1 -1
View File
@@ -2169,7 +2169,7 @@ class global_navigation extends navigation_node {
$coursenode = $parent->add($shortname, $url, self::TYPE_COURSE, $shortname, $course->id);
$coursenode->nodetype = self::NODETYPE_BRANCH;
$coursenode->hidden = (!$course->visible);
$coursenode->title($course->fullname);
$coursenode->title(format_string($course->fullname, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id))));
if (!$forcegeneric) {
$this->addedcourses[$course->id] = &$coursenode;
}