Merge branch 'master_MDL-28962' of git://github.com/danmarsden/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2011-08-23 18:31:01 +02:00
commit 4a88ad2f2a

View file

@ -645,7 +645,7 @@ function process_membership_tag($tagcontents){
if(isset($groupids[$member->groupname])) { if(isset($groupids[$member->groupname])) {
$member->groupid = $groupids[$member->groupname]; // Recall the group ID from cache if available $member->groupid = $groupids[$member->groupname]; // Recall the group ID from cache if available
} else { } else {
if($groupid = $DB->get_field('groups', 'id', 'name', $member->groupname, array('courseid'=>$ship->courseid))){ if($groupid = $DB->get_field('groups', 'id', array('courseid'=>$ship->courseid, 'name'=>$member->groupname))){
$member->groupid = $groupid; $member->groupid = $groupid;
$groupids[$member->groupname] = $groupid; // Store ID in cache $groupids[$member->groupname] = $groupid; // Store ID in cache
} else { } else {