diff --git a/plugins/personal/roles/class_userRoles.inc b/plugins/personal/roles/class_userRoles.inc index 1b19094c0c1628920ed20d9952879212a14c3477..1b39b4b6cde066e844391a70e75d6e3faf6472c5 100644 --- a/plugins/personal/roles/class_userRoles.inc +++ b/plugins/personal/roles/class_userRoles.inc @@ -109,6 +109,8 @@ class userRoles extends simplePlugin } /* We might be in some groups we have no read ACL on, so merge them in the choices */ $groups = array_merge($myGroups, $groups); + asort($groups); + asort($myGroups); $this->attributesAccess['groupsMembership']->attribute->setChoices(array_keys($groups), array_values($groups)); $this->attributesAccess['groupsMembership']->setValue(array_keys($myGroups)); @@ -146,6 +148,8 @@ class userRoles extends simplePlugin } /* We might be in some roles we have no read ACL on, so merge them in the choices */ $roles = array_merge($myRoles, $roles); + asort($roles); + asort($myRoles); $this->attributesAccess['rolesMembership']->attribute->setChoices(array_keys($roles), array_values($roles)); $this->attributesAccess['rolesMembership']->setValue(array_keys($myRoles)); @@ -354,6 +358,8 @@ class userRoles extends simplePlugin $myGroups = array_combine($this->attrs['userGroups'], $this->attrs['userGroups']); $groups = $this->attributesAccess['groupsMembership']->attribute->getDisplayChoices(); $groups = array_merge($myGroups, $groups); + asort($groups); + asort($myGroups); $this->attributesAccess['groupsMembership']->attribute->setChoices(array_keys($groups), array_values($groups)); $this->attributesAccess['groupsMembership']->setValue(array_keys($myGroups)); $this->templateGroups = array_keys($myGroups); @@ -367,6 +373,8 @@ class userRoles extends simplePlugin $myRoles = array_combine($this->attrs['userRoles'], $this->attrs['userRoles']); $roles = $this->attributesAccess['rolesMembership']->attribute->getDisplayChoices(); $roles = array_merge($myRoles, $roles); + asort($roles); + asort($myRoles); $this->attributesAccess['rolesMembership']->attribute->setChoices(array_keys($roles), array_values($roles)); $this->attributesAccess['rolesMembership']->setValue(array_keys($myRoles)); $this->templateRoles = array_keys($myRoles);