mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 16:32:18 +02:00
Code Issues Projects Releases Wiki Activity

MDL-68800 mod_lti: fix domain matching launches for 1.3

Browse Source
This commit is contained in:
Claude Vervoort 2020-05-26 15:36:14 -04:00
parent 6f85c23d7f
commit 4801550180
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mod/lti/launch.php
View File

@ -57,6 +57,9 @@ $cm = get_coursemodule_from_id('lti', $id, 0, false, MUST_EXIST);
$lti = $DB->get_record('lti', array('id' => $cm->instance), '*', MUST_EXIST);
$typeid = $lti->typeid;
if (empty($typeid) && ($tool = lti_get_tool_by_url_match($lti->toolurl))) {
$typeid = $tool->id;
}
if ($typeid) {
$config = lti_get_type_type_config($typeid);
if ($config->lti_ltiversion === LTI_VERSION_1P3) {

11
mod/lti/view.php
View File

@ -66,10 +66,12 @@ if ($l) { // Two ways to specify the module.
$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
if (!empty($lti->typeid)) {
$toolconfig = lti_get_type_config($lti->typeid);
} else if ($tool = lti_get_tool_by_url_match($lti->toolurl)) {
$toolconfig = lti_get_type_config($tool->id);
$typeid = $lti->typeid;
if (empty($typeid) && ($tool = lti_get_tool_by_url_match($lti->toolurl))) {
$typeid = $tool->id;
}
if ($typeid) {
$toolconfig = lti_get_type_config($typeid);
} else {
$toolconfig = array();
}
@ -116,7 +118,6 @@ if ($lti->showdescriptionlaunch && $lti->intro) {
echo $OUTPUT->box(format_module_intro('lti', $lti, $cm->id), 'generalbox description', 'intro');
}
$typeid = $lti->typeid;
if ($typeid) {
$config = lti_get_type_type_config($typeid);
} else {