moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +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');