From 81600f0f3c17e8c6928b25a99fbcf430aa54130c Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 24 Mar 2014 11:18:11 +1100 Subject: [PATCH] Merge branch 'patch-2' of https://github.com/designagencytom/Umbraco-CMS into designagencytom-patch-2 Conflicts: src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs --- .../umbraco.presentation/umbraco/members/EditMember.aspx.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs index 026e1994d4..c62eebbd6a 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs @@ -158,7 +158,10 @@ namespace umbraco.cms.presentation.members _memberGroups.ID = "Membergroups"; _memberGroups.Width = 175; var selectedMembers = ""; - foreach (var role in Roles.GetAllRoles()) + var roles = Roles.GetAllRoles(); + Array.Sort(roles); + + foreach(var role in roles) { // if a role starts with __umbracoRole we won't show it as it's an internal role used for public access if (role.StartsWith("__umbracoRole") == false)