From 498ee7d44b850e373db6e317d12bf55aef29586d Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Mon, 18 Feb 2013 10:54:53 +1300 Subject: [PATCH] MDL-38055 navigation: fixed ampersand use within titles Conflicts: lib/navigationlib.php --- lib/navigationlib.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/navigationlib.php b/lib/navigationlib.php index 0483f24c5c3..b213a6c5d4b 100644 --- a/lib/navigationlib.php +++ b/lib/navigationlib.php @@ -2378,7 +2378,8 @@ 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(format_string($course->fullname, true, array('context' => context_course::instance($course->id)))); + $fullname = format_string($course->fullname, true, array('context' => context_course::instance($course->id))); + $coursenode->title(str_replace('&', '&', $fullname)); if (!$forcegeneric) { $this->addedcourses[$course->id] = $coursenode; } -- 2.43.0