Permalink
Browse files

Merge branch 'wip-MDL-29188-master' of git://github.com/samhemelryk/m…

…oodle
  • Loading branch information...
2 parents 9568a4e + 71e0b3b commit f7dd6bda3113530ca24a11b88261271fab5b435f @nebgor nebgor committed Sep 13, 2011
Showing with 9 additions and 7 deletions.
  1. +5 −3 backup/backup.php
  2. +2 −2 course/format/topics/format.php
  3. +2 −2 course/format/weeks/format.php
View
@@ -60,10 +60,12 @@
$heading = get_string('backupcourse', 'backup', $course->shortname);
break;
case backup::TYPE_1SECTION :
- require_capability('moodle/backup:backupsection', get_context_instance(CONTEXT_COURSE, $course->id));
+ $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
+ require_capability('moodle/backup:backupsection', $coursecontext);
if (!empty($section->name)) {
- $heading = get_string('backupsection', 'backup', $section->name);
- $PAGE->navbar->add($section->name);
+ $sectionname = format_string($section->name, true, array('context' => $coursecontext));
+ $heading = get_string('backupsection', 'backup', $sectionname);
+ $PAGE->navbar->add($sectionname);
} else {
$heading = get_string('backupsection', 'backup', $section->section);
$PAGE->navbar->add(get_string('section').' '.$section->section);
@@ -96,7 +96,7 @@
echo '<div class="right side" >&nbsp;</div>';
echo '<div class="content">';
if (!is_null($thissection->name)) {
- echo $OUTPUT->heading($thissection->name, 3, 'sectionname');
+ echo $OUTPUT->heading(format_string($thissection->name, true, array('context' => $context)), 3, 'sectionname');
}
echo '<div class="summary">';
@@ -218,7 +218,7 @@
echo get_string('notavailable');
} else {
if (!is_null($thissection->name)) {
- echo $OUTPUT->heading($thissection->name, 3, 'sectionname');
+ echo $OUTPUT->heading(format_string($thissection->name, true, array('context' => $context)), 3, 'sectionname');
}
echo '<div class="summary">';
if ($thissection->summary) {
@@ -88,7 +88,7 @@
echo '<div class="content">';
if (!empty($thissection->name)) {
- echo $OUTPUT->heading($thissection->name, 3, 'sectionname');
+ echo $OUTPUT->heading(format_string($thissection->name, true, array('context' => $context)), 3, 'sectionname');
}
echo '<div class="summary">';
@@ -220,7 +220,7 @@
} else {
if (isset($thissection->name) && ($thissection->name !== NULL)) { // empty string is ok
- echo $OUTPUT->heading($thissection->name, 3, 'weekdates');
+ echo $OUTPUT->heading(format_string($thissection->name, true, array('context' => $context)), 3, 'weekdates');
} else {
echo $OUTPUT->heading($currenttext.$weekperiod, 3, 'weekdates');
}

0 comments on commit f7dd6bd

Please sign in to comment.