Ensure only target groups_members are added to backup. MDL-12453 ; merged from 19_STABLE

diff --git a/backup/backuplib.php b/backup/backuplib.php
index e0a4fc00bd6c6aedb254577e0723f97fb225a604..6036c6272bb4edb680203b7da5f1dc1514fa7282 100644 (file)
--- a/backup/backuplib.php
+++ b/backup/backuplib.php
@@ -2046,8 +2046,13 @@
 
         $status = true;
 
-        //Get groups_members
-        $groups_members = get_records("groups_members","groupid",$groupid);
+        //Get groups_members that are being included in backup
+        $groups_members = get_records_sql("SELECT gm.*
+                                           FROM {$CFG->prefix}groups_members gm,
+                                                {$CFG->prefix}backup_ids bi
+                                           WHERE gm.groupid = $groupid
+                                             AND bi.backup_code = $preferences->backup_unique_code
+                                             AND bi.table_name = 'user'");
 
         //Pring groups_members header
         if ($groups_members) {