Permalink
Browse files

Revert "MDL-38055 course: fixed print_overview use of title attribute"

This reverts commit 905ee48.
This reverts commit 45dbcbe.

This issue has failed testing and will be delayed.
  • Loading branch information...
1 parent 71db4e5 commit 38fd297dc7d6617f3030e6350478c0e9404ca39a @damyon damyon committed Mar 7, 2013
Showing with 3 additions and 4 deletions.
  1. +2 −2 course/lib.php
  2. +1 −2 lib/navigationlib.php
View
@@ -857,7 +857,7 @@ function print_overview($courses, array $remote_courses=array()) {
foreach ($courses as $course) {
$fullname = format_string($course->fullname, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id)));
echo $OUTPUT->box_start('coursebox');
- $attributes = array('title' => str_replace('&', '&', $fullname));
+ $attributes = array('title' => s($fullname));
if (empty($course->visible)) {
$attributes['class'] = 'dimmed';
}
@@ -876,7 +876,7 @@ function print_overview($courses, array $remote_courses=array()) {
}
foreach ($remote_courses as $course) {
echo $OUTPUT->box_start('coursebox');
- $attributes = array('title' => str_replace('&', '&', $course->fullname));
+ $attributes = array('title' => s($course->fullname));
echo $OUTPUT->heading(html_writer::link(
new moodle_url('/auth/mnet/jump.php', array('hostid' => $course->hostid, 'wantsurl' => '/course/view.php?id='.$course->remoteid)),
format_string($course->shortname),
View
@@ -2559,8 +2559,7 @@ public function add_course(stdClass $course, $forcegeneric = false, $ismycourse
$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' => get_context_instance(CONTEXT_COURSE, $course->id))));
if (!$forcegeneric) {
$this->addedcourses[$course->id] = $coursenode;
}

0 comments on commit 38fd297

Please sign in to comment.