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

moodle · May 11, 2018 · aaa1140 · aaa1140
2 parents b96a064 + ddb1a13
commit aaa1140
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/admin/tool/dataprivacy/classes/task/process_data_request_task.php b/admin/tool/dataprivacy/classes/task/process_data_request_task.php
@@ -68,8 +68,9 @@ public function execute() {
         $request = $requestpersistent->to_record();
 
         // Check if this request still needs to be processed. e.g. The user might have cancelled it before this task has run.
-        if ($request->status != api::DATAREQUEST_STATUS_APPROVED) {
-            mtrace("Request {$request->id} hasn\'t been approved yet or it has already been processed. Skipping...");
+        $status = $requestpersistent->get('status');
+        if (!api::is_active($status)) {
+            mtrace("Request {$requestid} with status {$status} doesn't need to be processed. Skipping...");
             return;
         }