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

Merge remote-tracking branch 'origin/v13/dev' into v14/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Core/Security/ContentPermissions.cs
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootcustomstep/pickdynamicrootcustomstep.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootorigin/pickdynamicrootorigin.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootquerystep/pickdynamicrootquerystep.controller.js
#	src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.controller.js
#	version.json
This commit is contained in:
Bjarke Berg
2024-03-01 08:17:06 +01:00
parent add6908e3f f17f5522c0
commit efb72b5b49
4 changed files with 61 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Core/Security/ContentPermissions.cs
View File

@@ -205,7 +205,7 @@ public class ContentPermissions
// get the implicit/inherited permissions for the user for this path
// if there is no entity for this id, then just use the id as the path (i.e. -1 or -20)
return CheckPermissionsPath(entity?.Path ?? nodeId.ToString(), user, permissionsToCheck)
return CheckPermissionsPath(entity?.Path ?? nodeId.ToString(CultureInfo.InvariantCulture), user, permissionsToCheck)
? ContentAccess.Granted
: ContentAccess.Denied;
}
@@ -265,7 +265,7 @@ public class ContentPermissions
// get the implicit/inherited permissions for the user for this path
// if there is no content item for this id, then just use the id as the path (i.e. -1 or -20)
return CheckPermissionsPath(contentItem?.Path ?? nodeId.ToString(), user, permissionsToCheck)
return CheckPermissionsPath(contentItem?.Path ?? nodeId.ToString(CultureInfo.InvariantCulture), user, permissionsToCheck)
? ContentAccess.Granted
: ContentAccess.Denied;
}