From a3c9960b869088e65e5570d5180ac0556c79f9ff Mon Sep 17 00:00:00 2001
From: tjhunt <tjhunt>
Date: Fri, 9 Jan 2009 06:14:39 +0000
Subject: [PATCH] restorelib: MDL-17519 fix merge error.

---
 backup/restorelib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 9d008f8056..7418b4e650 100644
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -3490,7 +3490,7 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
             //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)) {
+            } else if (!$DB->insert_record ("groups_members", $group_member)) {
                 $status = false;
                 continue;
             }
-- 
2.39.5