MDL-62554 tool_dataprivacy: Integration review fixes

2018-09-13 14:07:25 +08:00
parent 48eb55a1e5
commit 01f098afaa
11 changed files with 120 additions and 103 deletions
@@ -1216,11 +1216,13 @@ class api {
            $sql = implode("\n", $statements);

            // Get the context records matching our query.
-            $contextinstances = $DB->get_records_sql($sql, $params);
+            $contextids = $DB->get_fieldset_sql($sql, $params);

-            // Delete the matching context instances by passing an instance record without the purpose and instance.
-            foreach ($contextinstances as $instance) {
-                self::set_context_instance($instance);
+            // Delete the matching context instances.
+            foreach ($contextids as $contextid) {
+                if ($instance = context_instance::get_record_by_contextid($contextid, false)) {
+                    self::unset_context_instance($instance);
+                }
            }
        }