MDL-23898 backup - avoid role assignments for deleted users

moodle · Aug 24, 2010 · 28b6ff8 · 28b6ff8
1 parent f266594
commit 28b6ff8
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/backup/moodle2/restore_stepslib.php b/backup/moodle2/restore_stepslib.php
@@ -699,15 +699,20 @@ protected function define_structure() {
     }
 
     public function process_assignment($data) {
+        global $DB;
+
         $data = (object)$data;
 
         // Check roleid, userid are one of the mapped ones
         $newroleid = $this->get_mappingid('role', $data->roleid);
         $newuserid = $this->get_mappingid('user', $data->userid);
         // If newroleid and newuserid and component is empty and context valid assign via API (handles dupes and friends)
         if ($newroleid && $newuserid && empty($data->component) && $this->task->get_contextid()) {
-            // TODO: role_assign() needs one userid param to be able to specify our restore userid
+            // Only assign roles to not deleted users
-            role_assign($newroleid, $newuserid, $this->task->get_contextid());
+            if ($DB->record_exists('user', array('id' => $newuserid, 'deleted' => 0))) {
+                // TODO: role_assign() needs one userid param to be able to specify our restore userid
+                role_assign($newroleid, $newuserid, $this->task->get_contextid());
+            }
         }
     }