Merge branch 'm23_MDL-34994' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

This commit is contained in:
Eloy Lafuente (stronk7) 2012-08-27 18:20:44 +02:00
commit eec3a5d48d

View file

@ -80,10 +80,9 @@ class restore_choice_activity_structure_step extends restore_activity_structure_
global $DB; global $DB;
$data = (object)$data; $data = (object)$data;
$oldid = $data->id;
$data->choiceid = $this->get_new_parentid('choice'); $data->choiceid = $this->get_new_parentid('choice');
$data->optionid = $this->get_mappingid('choice_option', $oldid); $data->optionid = $this->get_mappingid('choice_option', $data->optionid);
$data->userid = $this->get_mappingid('user', $data->userid); $data->userid = $this->get_mappingid('user', $data->userid);
$data->timemodified = $this->apply_date_offset($data->timemodified); $data->timemodified = $this->apply_date_offset($data->timemodified);