From 101bd9c92e9cff110260b3ffb599cdfdace354a7 Mon Sep 17 00:00:00 2001
From: Petr Skoda <skodak@moodle.org>
Date: Thu, 8 Jul 2010 14:48:45 +0000
Subject: [PATCH] MDL-22148 course enrolment backup - removing extra info that
 is not necessary, thanks Eloy for explanation

---
 backup/moodle2/backup_stepslib.php | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/backup/moodle2/backup_stepslib.php b/backup/moodle2/backup_stepslib.php
index 7cb7c9a732a..d0045a50717 100644
--- a/backup/moodle2/backup_stepslib.php
+++ b/backup/moodle2/backup_stepslib.php
@@ -347,7 +347,7 @@ class backup_enrolments_structure_step extends backup_structure_step {
         $enrols = new backup_nested_element('enrols');
 
         $enrol = new backup_nested_element('enrol', array('id'), array(
-            'enrol', 'status', 'courseid', 'sortorder', 'name', 'enrolperiod', 'enrolstartdate',
+            'enrol', 'status', 'sortorder', 'name', 'enrolperiod', 'enrolstartdate',
             'enrolenddate', 'expirynotify', 'expirytreshold', 'notifyall',
             'password', 'cost', 'currency', 'roleid', 'customint1', 'customint2', 'customint3',
             'customint4', 'customchar1', 'customchar2', 'customdec1', 'customdec2',
@@ -356,7 +356,7 @@ class backup_enrolments_structure_step extends backup_structure_step {
         $userenrolments = new backup_nested_element('user_enrolments');
 
         $enrolment = new backup_nested_element('enrolment', array('id'), array(
-            'status', 'enrolid', 'userid', 'timestart', 'timeend', 'modifierid',
+            'status', 'userid', 'timestart', 'timeend', 'modifierid',
             'timemodified'));
 
         // Build the tree
@@ -369,20 +369,11 @@ class backup_enrolments_structure_step extends backup_structure_step {
 
         $enrol->set_source_table('enrol', array('courseid' => backup::VAR_COURSEID));
 
-        // User enrolments only added if specified
+        // User enrolments only added only if users included
         if ($users) {
             $enrolment->set_source_table('user_enrolments', array('enrolid' => backup::VAR_PARENTID));
         }
 
-        // Define id annotations
-        $enrol->annotate_ids('course', 'courseid');
-        $enrol->annotate_ids('role', 'roleid');
-        $enrol->annotate_ids('user', 'modifierid');
-
-        $enrolment->annotate_ids('user', 'userid');
-        $enrolment->annotate_ids('enrol', 'enrolid');
-        $enrolment->annotate_ids('user', 'modifierid');
-
         //TODO: let plugins annotate custom fields too and add more children
 
         return $enrolments;