Index: backup/moodle2/restore_stepslib.php
===================================================================
--- backup/moodle2/restore_stepslib.php	(date 1336505469000)
+++ backup/moodle2/restore_stepslib.php	(revision )
@@ -1387,13 +1387,13 @@
         } else if ((strpos($data->component, 'enrol_') === 0)) {
             // Deal with enrolment roles
             if ($enrolid = $this->get_mappingid('enrol', $data->itemid)) {
-                if ($component = $DB->get_field('enrol', 'component', array('id'=>$enrolid))) {
+                if ($enrol = $DB->get_field('enrol', 'enrol', array('id'=>$enrolid))) {
                     //note: we have to verify component because it might have changed
-                    if ($component === 'enrol_manual') {
+                    if ($enrol === 'manual') {
                         // manual is a special case, we do not use components - this owudl happen when converting from other plugin
                         role_assign($newroleid, $newuserid, $contextid); //TODO: do we need modifierid?
                     } else {
-                        role_assign($newroleid, $newuserid, $contextid, $component, $enrolid); //TODO: do we need modifierid?
+                        role_assign($newroleid, $newuserid, $contextid, 'enrol_'.$enrol, $enrolid); //TODO: do we need modifierid?
                     }
                 }
             }
Index: backup/moodle2/restore_course_task.class.php
===================================================================
--- backup/moodle2/restore_course_task.class.php	(date 1336505469000)
+++ backup/moodle2/restore_course_task.class.php	(revision )
@@ -66,13 +66,13 @@
             $this->add_step(new restore_course_structure_step('course_info', 'course.xml'));
         }
 
-        // Restore course role assignments and overrides (internally will observe the role_assignments setting)
-        $this->add_step(new restore_ras_and_caps_structure_step('course_ras_and_caps', 'roles.xml'));
-
         // Restore course enrolments (plugins and membership). Conditionally prevented for any IMPORT/HUB operation
         if ($this->plan->get_mode() != backup::MODE_IMPORT && $this->plan->get_mode() != backup::MODE_HUB) {
             $this->add_step(new restore_enrolments_structure_step('course_enrolments', 'enrolments.xml'));
         }
+
+        // Restore course role assignments and overrides (internally will observe the role_assignments setting)
+        $this->add_step(new restore_ras_and_caps_structure_step('course_ras_and_caps', 'roles.xml'));
 
         // Restore course filters (conditionally)
         if ($this->get_setting_value('filters')) {