moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +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

2
blocks/community/communitycourse.php
View file

@ -34,7 +34,7 @@ require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
require_login();
$courseid = required_param('courseid', PARAM_INT); //if no courseid is given
$parentcourse = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
$parentcourse = get_course($courseid);
$context = context_course::instance($courseid);
$PAGE->set_course($parentcourse);

2
blocks/completionstatus/details.php
View file

@ -32,7 +32,7 @@ $id = required_param('course', PARAM_INT);
$userid = optional_param('user', 0, PARAM_INT);
// Load course.
$course = $DB->get_record('course', array('id' => $id), '*', MUST_EXIST);
$course = get_course($id);
// Load user.
if ($userid) {

2
blocks/rss_client/editfeed.php
View file

@ -154,7 +154,7 @@ if ($courseid == SITEID) {
$courseid = 0;
}
if ($courseid) {
$course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
$course = get_course($courseid);
$PAGE->set_course($course);
$context = $PAGE->context;
} else {

2
blocks/rss_client/managefeeds.php
View file

@ -36,7 +36,7 @@ if ($courseid == SITEID) {
$courseid = 0;
}
if ($courseid) {
$course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
$course = get_course($courseid);
$PAGE->set_course($course);
$context = $PAGE->context;
} else {

2
blocks/rss_client/viewfeed.php
View file

@ -39,7 +39,7 @@ if ($courseid = SITEID) {
$courseid = 0;
}
if ($courseid) {
$course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
$course = get_course($courseid);
$PAGE->set_course($course);
$context = $PAGE->context;
} else {