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

Fixed tryParse

Browse Source
This commit is contained in:
Bjarke Berg
2021-09-15 13:40:08 +02:00
parent f68717c1c8
commit 39faf63f9c
45 changed files with 474 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
@@ -71,7 +72,7 @@ namespace Umbraco.Cms.Web.BackOffice.Trees
{
int asInt;
Guid asGuid = Guid.Empty;
if (int.TryParse(id, out asInt) == false)
if (int.TryParse(id, NumberStyles.Integer, CultureInfo.InvariantCulture, out asInt) == false)
{
if (Guid.TryParse(id, out asGuid) == false)
{
@@ -264,7 +265,7 @@ namespace Umbraco.Cms.Web.BackOffice.Trees
{
int id;
var parts = entity.Path.Split(Comma, StringSplitOptions.RemoveEmptyEntries);
return parts.Length >= 2 && int.TryParse(parts[1], out id) ? id : 0;
return parts.Length >= 2 && int.TryParse(parts[1], NumberStyles.Integer, CultureInfo.InvariantCulture, out id) ? id : 0;
}
protected abstract ActionResult<MenuItemCollection> PerformGetMenuForNode(string id, FormCollection queryStrings);
@@ -275,7 +276,7 @@ namespace Umbraco.Cms.Web.BackOffice.Trees
{
// try to parse id as an integer else use GetEntityFromId
// which will grok Guids, Udis, etc and let use obtain the id
if (!int.TryParse(id, out var entityId))
if (!int.TryParse(id, NumberStyles.Integer, CultureInfo.InvariantCulture, out var entityId))
{
var entity = GetEntityFromId(id);
if (entity == null)
@@ -544,7 +545,7 @@ namespace Umbraco.Cms.Web.BackOffice.Trees
{
return new Tuple<Guid?, int?>(idGuid, null);
}
if (int.TryParse(id, out idInt))
if (int.TryParse(id, NumberStyles.Integer, CultureInfo.InvariantCulture, out idInt))
{
return new Tuple<Guid?, int?>(null, idInt);
}
@@ -576,7 +577,7 @@ namespace Umbraco.Cms.Web.BackOffice.Trees
{
entity = _entityService.Get(idGuid, UmbracoObjectType);
}
else if (int.TryParse(s, out var idInt))
else if (int.TryParse(s, NumberStyles.Integer, CultureInfo.InvariantCulture, out var idInt))
{
entity = _entityService.Get(idInt, UmbracoObjectType);
}