From 641d878d082af9677849c12e6d02ee9aaf65b9f1 Mon Sep 17 00:00:00 2001 From: David Monllao Date: Mon, 14 May 2018 15:52:31 +0200 Subject: [PATCH] MDL-62430 block_html: Check that block instances are block_html --- blocks/html/classes/privacy/provider.php | 10 +++++++--- mod/lti/classes/privacy/provider.php | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/blocks/html/classes/privacy/provider.php b/blocks/html/classes/privacy/provider.php index f3659f77231..21131fee621 100644 --- a/blocks/html/classes/privacy/provider.php +++ b/blocks/html/classes/privacy/provider.php @@ -159,7 +159,9 @@ class provider implements } // The only way to delete data for the html block is to delete the block instance itself. - blocks_delete_instance(static::get_instance_from_context($context)); + if ($blockinstance = static::get_instance_from_context($context)) { + blocks_delete_instance($blockinstance); + } } /** @@ -174,7 +176,9 @@ class provider implements if (!$context instanceof \context_block) { continue; } - blocks_delete_instance(static::get_instance_from_context($context)); + if ($blockinstance = static::get_instance_from_context($context)) { + blocks_delete_instance($blockinstance); + } } } @@ -187,6 +191,6 @@ class provider implements protected static function get_instance_from_context(\context_block $context) { global $DB; - return $DB->get_record('block_instances', ['id' => $context->instanceid]); + return $DB->get_record('block_instances', ['id' => $context->instanceid, 'blockname' => 'html']); } } diff --git a/mod/lti/classes/privacy/provider.php b/mod/lti/classes/privacy/provider.php index d308ecac110..220caa5660e 100644 --- a/mod/lti/classes/privacy/provider.php +++ b/mod/lti/classes/privacy/provider.php @@ -164,7 +164,7 @@ class provider implements } if ($cm = get_coursemodule_from_id('lti', $context->instanceid)) { - $DB->delete_records('lti_submission', ['ltiid' => key($ltiidstocmids)]); + $DB->delete_records('lti_submission', ['ltiid' => $cm->instance]); } }