Merge branch 'master_MDL-60253' of https://github.com/CengageEng/moodle

This commit is contained in:
Jun Pataleta 2017-11-20 13:21:30 +13:00
commit 4768fa336a

View File

@ -103,7 +103,12 @@ function lti_get_launch_data($instance) {
if ($tool) {
$typeid = $tool->id;
} else {
$typeid = null;
$tool = lti_get_tool_by_url_match($instance->securetoolurl, $instance->course);
if ($tool) {
$typeid = $tool->id;
} else {
$typeid = null;
}
}
} else {
$typeid = $instance->typeid;