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

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

View file

@ -702,7 +702,8 @@ function process_membership_tag($tagcontents){
}
// Add the user-to-group association if it doesn't already exist
if($member->groupid) {
groups_add_member($member->groupid, $memberstoreobj->userid);
groups_add_member($member->groupid, $memberstoreobj->userid,
'enrol_imsenterprise', $einstance->id);
}
} // End of group-enrolment (from member.role.extension.cohort tag)
@ -793,6 +794,19 @@ function load_role_mappings() {
}
}
/**
* Called whenever anybody tries (from the normal interface) to remove a group
* member which is registered as being created by this component. (Not called
* when deleting an entire group or course at once.)
* @param int $itemid Item ID that was stored in the group_members entry
* @param int $groupid Group ID
* @param int $userid User ID being removed from group
* @return bool True if the remove is permitted, false to give an error
*/
function enrol_imsenterprise_allow_group_member_remove($itemid, $groupid, $userid) {
return false;
}
} // end of class