MDL-27164 groups Do not show multiple instances of the same role as multiple

2013-01-11 11:17:11 +00:00
parent 0eda863c21
commit 5a701d1fbe
1 changed files with 3 additions and 2 deletions
@@ -767,7 +767,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();
@@ -797,7 +797,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;
    }