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

- resolved conflicts, minor whitespace and fixed quote. - note: textlib_get_instance() is already deprecated
2011-09-13 16:06:21 +08:00
parent 7eae2c5ae2 91d284c145
commit d1e362405e
31 changed files with 101 additions and 54 deletions
@@ -2188,7 +2188,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;
        }