Permalink
Browse files

Revert "MDL-38055 block_courseoverview: fixed formatting of course fu…

…llname"

This reverts commit 6013e16.
This reverts commit 498ee7d.

This issue has failed testing and will be delayed.
  • Loading branch information...
damyon committed Mar 7, 2013
1 parent f73c7d4 commit d6d470ae1541cc95069812bc404fcd7ec0784aa8
Showing with 4 additions and 6 deletions.
  1. +3 −4 blocks/course_overview/renderer.php
  2. +1 −2 lib/navigationlib.php
@@ -104,12 +104,11 @@ public function course_overview($courses, $overviews) {
$html .= html_writer::end_tag('div');
}
- $context = context_course::instance($course->id);
- $fullname = format_string($course->fullname, true, array('context' => $context));
- $attributes = array('title' => str_replace('&', '&', $fullname));
+ $attributes = array('title' => s($course->fullname));
if ($course->id > 0) {
$courseurl = new moodle_url('/course/view.php', array('id' => $course->id));
- $link = html_writer::link($courseurl, $fullname, $attributes);
+ $coursefullname = format_string($course->fullname, true, $course->id);
+ $link = html_writer::link($courseurl, $coursefullname, $attributes);
$html .= $this->output->heading($link, 2, 'title');
} else {
$html .= $this->output->heading(html_writer::link(
View
@@ -2396,8 +2396,7 @@ public function add_course(stdClass $course, $forcegeneric = false, $coursetype
$coursenode = $parent->add($shortname, $url, self::TYPE_COURSE, $shortname, $course->id);
$coursenode->nodetype = self::NODETYPE_BRANCH;
$coursenode->hidden = (!$course->visible);
- $fullname = format_string($course->fullname, true, array('context' => context_course::instance($course->id)));
- $coursenode->title(str_replace('&', '&', $fullname));
+ $coursenode->title(format_string($course->fullname, true, array('context' => context_course::instance($course->id))));
if (!$forcegeneric) {
$this->addedcourses[$course->id] = $coursenode;
}

0 comments on commit d6d470a

Please sign in to comment.