From 8b65d0cdff5bdc5b434589ec9111940ec15bb11a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Mudr=C3=A1k?= <david@moodle.com>
Date: Fri, 4 Mar 2016 16:42:05 +0100
Subject: [PATCH] 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.
---
 mod/lti/lib.php            |  6 ++++--
 mod/lti/tests/lib_test.php | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/mod/lti/lib.php b/mod/lti/lib.php
index cf9df60646d..090ae808237 100644
--- a/mod/lti/lib.php
+++ b/mod/lti/lib.php
@@ -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));
 }
diff --git a/mod/lti/tests/lib_test.php b/mod/lti/tests/lib_test.php
index f154683f50e..0473f789abf 100644
--- a/mod/lti/tests/lib_test.php
+++ b/mod/lti/tests/lib_test.php
@@ -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);
+    }
 }