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

MDL-39876 Change get_record('course') calls to get_course

Browse source
This commit is contained in:
sam marshall 2013-06-18 17:00:37 +01:00
parent 838d78a9ff
commit ab7632b74c
189 changed files with 231 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/accesslib.php
View file

@ -1428,27 +1428,25 @@ function get_local_override($roleid, $contextid, $capability) {
* @return array of ($context, $course, $cm)
*/
function get_context_info_array($contextid) {
global $DB;
$context = context::instance_by_id($contextid, MUST_EXIST);
$course = null;
$cm = null;
if ($context->contextlevel == CONTEXT_COURSE) {
$course = $DB->get_record('course', array('id'=>$context->instanceid), '*', MUST_EXIST);
$course = get_course($context->instanceid);
} else if ($context->contextlevel == CONTEXT_MODULE) {
$cm = get_coursemodule_from_id('', $context->instanceid, 0, false, MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
} else if ($context->contextlevel == CONTEXT_BLOCK) {
$parent = $context->get_parent_context();
if ($parent->contextlevel == CONTEXT_COURSE) {
$course = $DB->get_record('course', array('id'=>$parent->instanceid), '*', MUST_EXIST);
$course = get_course($parent->instanceid);
} else if ($parent->contextlevel == CONTEXT_MODULE) {
$cm = get_coursemodule_from_id('', $parent->instanceid, 0, false, MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
}
}

2
lib/db/install.php
View file

@ -96,7 +96,7 @@ function xmldb_main_install() {
}
// Make sure site course context exists
context_course::instance($SITE->id);
// Update the global frontpage cache
// Update the global frontpage cache from database.
$SITE = $DB->get_record('course', array('id'=>$newsite->id), '*', MUST_EXIST);

2
lib/modinfolib.php
View file

@ -247,7 +247,7 @@ class course_modinfo extends stdClass {
// Check modinfo field is set. If not, build and load it.
if (empty($course->modinfo) || empty($course->sectioncache)) {
rebuild_course_cache($course->id);
$course = $DB->get_record('course', array('id'=>$course->id), '*', MUST_EXIST);
$course = get_course($course->id);
}
// Set initial values

4
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) {
@ -4906,7 +4906,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();

2
lib/navigationlib.php
View file

@ -2744,7 +2744,7 @@ class global_navigation_for_ajax extends global_navigation {
$this->load_category($this->instanceid, self::TYPE_MY_CATEGORY);
break;
case self::TYPE_COURSE :
$course = $DB->get_record('course', array('id' => $this->instanceid), '*', MUST_EXIST);
$course = get_course($this->instanceid);
require_course_login($course, true, null, false, true);
$this->page->set_context(context_course::instance($course->id));
$coursenode = $this->add_course($course);

2
lib/pagelib.php
View file

@ -950,7 +950,7 @@ class moodle_page {
if (!$this->_course || $this->_course->id != $cm->course) {
if (!$course) {
$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
}
if ($course->id != $cm->course) {
throw new coding_exception('The course you passed to $PAGE->set_cm does not correspond to the $cm.');

4
lib/tests/accesslib_test.php
View file

@ -2120,8 +2120,8 @@ class core_accesslib_testcase extends advanced_testcase {
$guestid = $CFG->siteguest;
// Enrol some users into some courses.
$course1 = $DB->get_record('course', array('id'=>$testcourses[22]), '*', MUST_EXIST);
$course2 = $DB->get_record('course', array('id'=>$testcourses[7]), '*', MUST_EXIST);
$course1 = get_course($testcourses[22]);
$course2 = get_course($testcourses[7]);
$cms = $DB->get_records('course_modules', array('course'=>$course1->id), 'id');
$cm1 = reset($cms);
$blocks = $DB->get_records('block_instances', array('parentcontextid'=>context_module::instance($cm1->id)->id), 'id');