Merge branch 'MDL-64714-35' of git://github.com/cescobedo/moodle into…

… MOODLE_35_STABLE
moodle · Feb 13, 2019 · ea2ed45 · ea2ed45
2 parents c35399c + 1210555
commit ea2ed45
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/auth/mnet/classes/privacy/provider.php b/auth/mnet/classes/privacy/provider.php
@@ -273,13 +273,15 @@ public static function delete_data_for_user(approved_contextlist $contextlist) {
             return;
         }
 
+        $userid = $contextlist->get_user()->id;
         foreach ($contextlist->get_contexts() as $context) {
             if ($context->contextlevel != CONTEXT_USER) {
-                return;
+                continue;
+            }
+            if ($context->instanceid == $userid) {
+                // Because we only use user contexts the instance ID is the user ID.
+                $DB->delete_records('mnet_log', ['userid' => $context->instanceid]);
             }
-
-            // Because we only use user contexts the instance ID is the user ID.
-            $DB->delete_records('mnet_log', ['userid' => $context->instanceid]);
         }
     }
 }
diff --git a/auth/oauth2/classes/privacy/provider.php b/auth/oauth2/classes/privacy/provider.php
@@ -178,12 +178,15 @@ public static function delete_data_for_user(approved_contextlist $contextlist) {
         if (empty($contextlist->count())) {
             return;
         }
+        $userid = $contextlist->get_user()->id;
         foreach ($contextlist->get_contexts() as $context) {
             if ($context->contextlevel != CONTEXT_USER) {
-                return;
+                continue;
+            }
+            if ($context->instanceid == $userid) {
+                // Because we only use user contexts the instance ID is the user ID.
+                static::delete_user_data($context->instanceid);
             }
-            // Because we only use user contexts the instance ID is the user ID.
-            static::delete_user_data($context->instanceid);
         }
     }