moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +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
mod/lti/grade.php
View file

@ -65,7 +65,7 @@ if ($l) { // Two ways to specify the module
$lti = $DB->get_record('lti', array('id' => $cm->instance), '*', MUST_EXIST);
}
$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
require_login($course, false, $cm);
$context = context_module::instance($cm->id);

2
mod/lti/index.php
View file

@ -51,7 +51,7 @@ require_once($CFG->dirroot.'/mod/lti/lib.php');
$id = required_param('id', PARAM_INT); // course id
$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
$course = get_course($id);
require_login($course);
$PAGE->set_pagelayout('incourse');

2
mod/lti/launch.php
View file

@ -55,7 +55,7 @@ $id = required_param('id', PARAM_INT); // Course Module ID
$cm = get_coursemodule_from_id('lti', $id, 0, false, MUST_EXIST);
$lti = $DB->get_record('lti', array('id' => $cm->instance), '*', MUST_EXIST);
$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
require_login($course);

2
mod/lti/view.php
View file

@ -63,7 +63,7 @@ if ($l) { // Two ways to specify the module
$lti = $DB->get_record('lti', array('id' => $cm->instance), '*', MUST_EXIST);
}
$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
$tool = lti_get_tool_by_url_match($lti->toolurl);
if ($tool) {