MDL-53351 lti: Do not throw PHP notice when deleting LTI instance

The typeid=0 is a valid and common value representing "Automatic, based
on launch URL" type. In that case, no record in the lti_types table is
found. Thence attempting to access its toolproxyid property used to
throw PHP notice.
This commit is contained in:
David Mudrák
2016-03-04 16:50:45 +01:00
parent fba7a51461
commit 8b65d0cdff
2 changed files with 19 additions and 2 deletions
+4 -2
View File
@@ -188,8 +188,10 @@ function lti_delete_instance($id) {
lti_grade_item_delete($basiclti);
$ltitype = $DB->get_record('lti_types', array('id' => $basiclti->typeid));
$DB->delete_records('lti_tool_settings',
array('toolproxyid' => $ltitype->toolproxyid, 'course' => $basiclti->course, 'coursemoduleid' => $id));
if ($ltitype) {
$DB->delete_records('lti_tool_settings',
array('toolproxyid' => $ltitype->toolproxyid, 'course' => $basiclti->course, 'coursemoduleid' => $id));
}
return $DB->delete_records("lti", array("id" => $basiclti->id));
}
+15
View File
@@ -89,4 +89,19 @@ class mod_lti_lib_testcase extends advanced_testcase {
$this->assertEquals(1, $completiondata->completionstate);
}
/**
* Test deleting LTI instance.
*/
public function test_lti_delete_instance() {
$this->resetAfterTest();
$this->setAdminUser();
$course = $this->getDataGenerator()->create_course(array());
$lti = $this->getDataGenerator()->create_module('lti', array('course' => $course->id));
$cm = get_coursemodule_from_instance('lti', $lti->id);
// Must not throw notices.
course_delete_module($cm->id);
}
}