moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-31973-master-6' of git://git.luns.net.uk/moodle

Browse source 
Conflicts:
	lib/db/upgrade.php
This commit is contained in:
Eloy Lafuente (stronk7) 2012-08-29 00:42:43 +02:00
commit 238f7761af
14 changed files with 161 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backup/moodle2/backup_stepslib.php
View file

@ -1005,7 +1005,7 @@ class backup_groups_structure_step extends backup_structure_step {
$members = new backup_nested_element('group_members');
$member = new backup_nested_element('group_member', array('id'), array(
'userid', 'timeadded'));
'userid', 'timeadded', 'component', 'itemid'));
$groupings = new backup_nested_element('groupings');

11
backup/moodle2/restore_stepslib.php
View file

@ -780,6 +780,17 @@ class restore_groups_structure_step extends restore_structure_step {
// map user newitemid and insert if not member already
if ($data->userid = $this->get_mappingid('user', $data->userid)) {
if (!$DB->record_exists('groups_members', array('groupid' => $data->groupid, 'userid' => $data->userid))) {
// Check the componment, if any, exists
if (!empty($data->component)) {
$dir = get_component_directory($data->component);
if (!$dir || !is_dir($dir)) {
// Component does not exist on restored system; clear
// component and itemid
unset($data->component);
unset($data->itemid);
}
}
$DB->insert_record('groups_members', $data);
}
}