yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'patch-2' of https://github.com/designagencytom/Umbraco-CMS into designagencytom-patch-2

Browse Source 
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
This commit is contained in:
Shannon
2014-03-24 11:18:11 +11:00
parent 74ccd79408
commit 81600f0f3c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
View File

@@ -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)