mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Aparup Banerjee 2011-09-13 11:58:21 +08:00
commit f7dd6bda31
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backup/backup.php
View File

@ -60,10 +60,12 @@ switch ($type) {
$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);

4
course/format/topics/format.php
View File

@ -96,7 +96,7 @@ if ($thissection->summary or $thissection->sequence or $PAGE->user_is_editing())
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 @@ while ($section <= $course->numsections) {
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) {

4
course/format/weeks/format.php
View File

@ -88,7 +88,7 @@ defined('MOODLE_INTERNAL') || die();
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 @@ defined('MOODLE_INTERNAL') || die();
} 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');
}