Merge branch 'wip-MDL-38055-m25' of git://github.com/samhemelryk/moodle

2013-04-16 14:32:53 +08:00
parent e32a8ae832 1d8a1a87de
commit e0cded5d44
2 changed files with 5 additions and 2 deletions
@@ -2379,7 +2379,9 @@ class global_navigation extends navigation_node {
        $coursenode = $parent->add($coursename, $url, self::TYPE_COURSE, $shortname, $course->id);
        $coursenode->nodetype = self::NODETYPE_BRANCH;
        $coursenode->hidden = (!$course->visible);
-        $coursenode->title($fullname);
+        // We need to decode &amp;'s here as they will have been added by format_string above and attributes will be encoded again
+        // later.
+        $coursenode->title(str_replace('&amp;', '&', $fullname));
        if (!$forcegeneric) {
            $this->addedcourses[$course->id] = $coursenode;
        }