Merge branch 'MDL-41564' of git://github.com/rwijaya/moodle

mod/folder/edit.php

@@ -69,6 +69,7 @@ if ($mform->is_cancelled()) {
 }
 
 echo $OUTPUT->header();
+echo $OUTPUT->heading(format_string($folder->name));
 echo $OUTPUT->box_start('generalbox foldertree');
 $mform->display();
 echo $OUTPUT->box_end();

mod/folder/index.php

@@ -47,6 +47,7 @@ $PAGE->set_title($course->shortname.': '.$strfolders);
 $PAGE->set_heading($course->fullname);
 $PAGE->navbar->add($strfolders);
 echo $OUTPUT->header();
+echo $OUTPUT->heading($strfolders);
 
 if (!$folders = get_all_instances_in_course('folder', $course)) {
     notice(get_string('thereareno', 'moodle', $strfolders), "$CFG->wwwroot/course/view.php?id=$course->id");