From: stronk7 <stronk7>
Date: Fri, 4 Feb 2005 16:24:12 +0000 (+0000)
Subject: Now group members are only included (backup and restore) if
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=1d9169d31245f227e3cb574486de1ff5b9ee0627;p=moodle.git

Now group members are only included (backup and restore) if
we have selected to have users! Thanks to Etienne! Bug 2486
(http://moodle.org/bugs/bug.php?op=show&bugid=2486)

Merged from MOODLE_14_STABLE
---

diff --git a/backup/backuplib.php b/backup/backuplib.php
index b1026a7958..84f8f069bc 100644
--- a/backup/backuplib.php
+++ b/backup/backuplib.php
@@ -1187,8 +1187,10 @@
                 fwrite ($bf,full_tag("TIMECREATED",4,false,$group->timecreated));
                 fwrite ($bf,full_tag("TIMEMODIFIED",4,false,$group->timemodified));
                 
-                //Now, backup groups_members
-                $status2 = backup_groups_members_info($bf,$preferences,$group->id);
+                //Now, backup groups_members, only if users are included
+                if ($preferences->backup_users != 2) {
+                    $status2 = backup_groups_members_info($bf,$preferences,$group->id);
+                }
 
                 //End group tag
                 fwrite ($bf,end_tag("GROUP",3,true));
diff --git a/backup/restorelib.php b/backup/restorelib.php
index c643950dc6..5a5a86da2d 100644
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -1267,8 +1267,11 @@
                             backup_putid($restore->backup_unique_code,"group",
                                          $group->id, $newid);
                         }
-                        //Now restore members in the groups_members
-                        $status2 = restore_create_groups_members($newid,$info,$restore);
+                        //Now restore members in the groups_members, only if
+                        //users are included
+                        if ($restore->users != 2) {
+                            $status2 = restore_create_groups_members($newid,$info,$restore);
+                        }
                     }   
                 }
             }