Merge branch 'MDL-57600-master' of git://github.com/lameze/moodle

This commit is contained in:
Andrew Nicols 2018-05-30 09:16:57 +08:00
commit f77bb2834c
2 changed files with 6 additions and 6 deletions

View File

@ -414,7 +414,7 @@ abstract class format_section_renderer_base extends plugin_renderer_base {
}
/**
* Generate a summary of a section for display on the 'coruse index page'
* Generate a summary of a section for display on the 'course index page'
*
* @param stdClass $section The course_section entry from DB
* @param stdClass $course The course entry from DB
@ -604,7 +604,7 @@ abstract class format_section_renderer_base extends plugin_renderer_base {
* Show if something is on on the course clipboard (moving around)
*
* @param stdClass $course The course entry from DB
* @param int $sectionno The section number in the coruse which is being dsiplayed
* @param int $sectionno The section number in the course which is being displayed
* @return string HTML to output.
*/
protected function course_activity_clipboard($course, $sectionno = null) {
@ -634,7 +634,7 @@ abstract class format_section_renderer_base extends plugin_renderer_base {
*
* @param stdClass $course The course entry from DB
* @param array $sections The course_sections entries from the DB
* @param int $sectionno The section number in the coruse which is being dsiplayed
* @param int $sectionno The section number in the course which is being displayed
* @return array associative array with previous and next section link
*/
protected function get_nav_links($course, $sections, $sectionno) {
@ -679,7 +679,7 @@ abstract class format_section_renderer_base extends plugin_renderer_base {
/**
* Generate the header html of a stealth section
*
* @param int $sectionno The section number in the coruse which is being dsiplayed
* @param int $sectionno The section number in the course which is being displayed
* @return string HTML to output.
*/
protected function stealth_section_header($sectionno) {
@ -709,7 +709,7 @@ abstract class format_section_renderer_base extends plugin_renderer_base {
/**
* Generate the html for a hidden section
*
* @param int $sectionno The section number in the coruse which is being dsiplayed
* @param int $sectionno The section number in the course which is being displayed
* @param int|stdClass $courseorid The course to get the section name for (object or just course id)
* @return string HTML to output.
*/

View File

@ -863,7 +863,7 @@ class core_course_courselib_testcase extends advanced_testcase {
// Test move the marked section down..
move_section_to($course, 2, 4);
// Verify that the coruse marker has been moved along with the section..
// Verify that the course marker has been moved along with the section..
$course = $DB->get_record('course', array('id' => $course->id));
$this->assertEquals(4, $course->marker);