MDL-17519 - restore: preventing group member duplicates; merged from MOODLE_19_STABLE

diff --git a/backup/restorelib.php b/backup/restorelib.php
index bba9419cfbd0f68313cc61f5846b45c34285a93e..e974ab4ca43f606ebbf532ee7cc3cf85fd14005e 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -3419,6 +3419,8 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
             $group_member->userid = $user->new_id;
 
             //The structure is equal to the db, so insert the groups_members
+            if ($DB->record_exists("groups_members", array('groupid'=>$group_member->groupid, 'userid'=>$group_member->userid))) {
+                // user already member
             if (!$DB->insert_record ("groups_members", $group_member)) {
                 $status = false;
                 continue;