moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 02:16:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-39876-master' of git://github.com/sammarshallou/moodle

Browse source 
Conflicts:
	course/lib.php
This commit is contained in:
Sam Hemelryk 2013-08-21 12:08:46 +12:00
commit 6eee89bc8f
191 changed files with 280 additions and 274 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/moodlelib.php
View file

@ -2887,7 +2887,7 @@ function require_login($courseorid = null, $autologinguest = true, $cm = null, $
} else if ($courseorid == SITEID) {
$course = clone($SITE);
} else {
$course = $DB->get_record('course', array('id' => $courseorid), '*', MUST_EXIST);
$course = get_course($courseorid);
}
if ($cm) {
if ($cm->course != $course->id) {
@ -4912,7 +4912,7 @@ function remove_course_contents($courseid, $showfeedback = true, array $options
// Some crazy wishlist of stuff we should skip during purging of course content.
$options = (array)$options;
$course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
$course = get_course($courseid);
$coursecontext = context_course::instance($courseid);
$fs = get_file_storage();
@ -5105,7 +5105,7 @@ function remove_course_contents($courseid, $showfeedback = true, array $options
if (!empty($options['keep_groups_and_groupings'])) {
$oldcourse->defaultgroupingid = 0;
}
$DB->update_record('course', $oldcourse);
update_course_record($oldcourse);
// Delete course sections and availability options.
$DB->delete_records_select('course_sections_availability',