Merge branch 'MDL-62564-master-fix' of git://github.com/andrewnicols/moodle

admin/tool/dataprivacy/classes/task/process_data_request_task.php

@@ -100,6 +100,7 @@ class process_data_request_task extends adhoc_task {
 
         mtrace('Processing request...');
         $completestatus = api::DATAREQUEST_STATUS_COMPLETE;
+        $deleteuser = false;
 
         if ($request->type == api::DATAREQUEST_TYPE_EXPORT) {
             // Get the user context.
@@ -134,6 +135,7 @@ class process_data_request_task extends adhoc_task {
 
             $manager->delete_data_for_user($approvedclcollection);
             $completestatus = api::DATAREQUEST_STATUS_DELETED;
+            $deleteuser = !$foruser->deleted;
         }
 
         // When the preparation of the metadata finishes, update the request status to awaiting approval.
@@ -266,7 +268,7 @@ class process_data_request_task extends adhoc_task {
             }
         }
 
-        if ($request->type == api::DATAREQUEST_TYPE_DELETE) {
+        if ($deleteuser) {
             // Delete the user.
             delete_user($foruser);
         }