From 53c07f1644511b9a6c151f1f5f413f04f0f77bb5 Mon Sep 17 00:00:00 2001 From: Michael Aherne Date: Fri, 11 Jan 2013 11:12:33 +0000 Subject: [PATCH] MDL-27164 groups Do not show multiple instances of the same role as multiple --- group/lib.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/group/lib.php b/group/lib.php index a3f8fac70f1..20c9555d581 100644 --- a/group/lib.php +++ b/group/lib.php @@ -846,7 +846,7 @@ function groups_calculate_role_people($rs, $context) { $roles[$roledata->id] = $roledata; } // Record that user has role - $users[$rec->userid]->roles[] = $roles[$rec->roleid]; + $users[$rec->userid]->roles[$rec->roleid] = $roles[$rec->roleid]; } } $rs->close(); @@ -876,7 +876,8 @@ function groups_calculate_role_people($rs, $context) { } else if($rolecount > 1) { $roleid = '*'; } else { - $roleid = $userdata->roles[0]->id; + $userrole = reset($userdata->roles); + $roleid = $userrole->id; } $roles[$roleid]->users[$userid] = $userdata; }