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

re-enables the weird IgnorePublishedContentCollisions, simplifies IPublishedRouter interface (more flexible with request options),

Browse Source
This commit is contained in:
Shannon
2021-01-08 10:42:57 +11:00
parent b017ed0b1b
commit b4922d2685
11 changed files with 116 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Umbraco.Core/Routing/UrlProviderExtensions.cs
View File

@@ -204,20 +204,19 @@ namespace Umbraco.Web.Routing
}
uri = uriUtility.UriToUmbraco(uri);
IPublishedRequestBuilder pcr = await publishedRouter.CreateRequestAsync(uri);
var routeResult = await publishedRouter.TryRouteRequestAsync(pcr);
IPublishedRequestBuilder builder = await publishedRouter.CreateRequestAsync(uri);
IPublishedRequest pcr = await publishedRouter.RouteRequestAsync(builder, new RouteRequestOptions(RouteDirection.Outbound));
if (pcr.PublishedContent == null)
if (!pcr.HasPublishedContent())
{
var urlInfo = UrlInfo.Message(textService.Localize("content/routeErrorCannotRoute"), culture);
return Attempt.Succeed(urlInfo);
}
// TODO: What is this?
//if (pcr.IgnorePublishedContentCollisions)
//{
// return false;
//}
if (pcr.IgnorePublishedContentCollisions)
{
return Attempt<UrlInfo>.Fail();
}
if (pcr.PublishedContent.Id != content.Id)
{