Home
Documentation
Downloads
Demo
Tracker
Development
Translation
Moodle.net
Search
projects
/
moodle.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
92b00c3
)
MDL-27164 groups Do not show multiple instances of the same role as multiple
author
Michael Aherne
<michael.aherne@strath.ac.uk>
Fri, 11 Jan 2013 11:12:33 +0000
(11:12 +0000)
committer
Michael Aherne
<michael.aherne@strath.ac.uk>
Fri, 11 Jan 2013 11:12:33 +0000
(11:12 +0000)
group/lib.php
patch
|
blob
|
blame
|
history
diff --git
a/group/lib.php
b/group/lib.php
index
a3f8fac
..
20c9555
100644
(file)
--- 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;
}