Merge branch 'MOODLE_32_STABLE_MDL-60007' of https://github.com/Cenga…

…geEng/moodle into MOODLE_32_STABLE
moodle · Nov 2, 2017 · 2d56bc1 · 2d56bc1
2 parents 2ba8535 + 44b817c
commit 2d56bc1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/mod/lti/services.php b/mod/lti/services.php
@@ -33,6 +33,7 @@
 $response = new \mod_lti\local\ltiservice\response();
 
 $isget = $response->get_request_method() == 'GET';
+$isdelete = $response->get_request_method() == 'DELETE';
 
 if ($isget) {
     $response->set_accept(isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : '');
@@ -51,7 +52,7 @@
     foreach ($resources as $resource) {
         if (($isget && !empty($accept) && (strpos($accept, '*/*') === false) &&
              !in_array($accept, $resource->get_formats())) ||
-            (!$isget && !in_array($response->get_content_type(), $resource->get_formats()))) {
+            ((!$isget && !$isdelete) && !in_array($response->get_content_type(), $resource->get_formats()))) {
             continue;
         }
         $template = $resource->get_template();