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

blocks/course_overview/renderer.php

@@ -101,7 +101,8 @@ class block_course_overview_renderer extends plugin_renderer_base {
 
             }
 
-            $attributes = array('title' => s($course->fullname));
+            // No need to pass title through s() here as it will be done automatically by html_writer.
+            $attributes = array('title' => $course->fullname);
             if ($course->id > 0) {
                 $courseurl = new moodle_url('/course/view.php', array('id' => $course->id));
                 $coursefullname = format_string($course->fullname, true, $course->id);

lib/navigationlib.php

@@ -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 &'s here as they will have been added by format_string above and attributes will be encoded again
+        // later.
+        $coursenode->title(str_replace('&', '&', $fullname));
         if (!$forcegeneric) {
             $this->addedcourses[$course->id] = $coursenode;
         }