L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "MDL-38055 block_courseoverview: fixed formatting of course fullname"

Browse Source 
This reverts commit 6013e16b25.
This reverts commit 498ee7d44b.

This issue has failed testing and will be delayed.
This commit is contained in:
Damyon Wiese
2013-03-07 10:29:47 +08:00
parent f73c7d410b
commit d6d470ae15
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/course_overview/renderer.php
+3 -4
View File
@@ -104,12 +104,11 @@ class block_course_overview_renderer extends plugin_renderer_base {
$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(
lib/navigationlib.php
+1 -2
View File
@@ -2396,8 +2396,7 @@ 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);
$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;
}