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

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

Browse Source 
# Conflicts:
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
#	src/Umbraco.Web.BackOffice/Filters/FileUploadCleanupFilterAttribute.cs
This commit is contained in:
Bjarke Berg
2023-06-12 10:10:08 +02:00
parent 1e95437a0a 1033806c49
commit 520309e3f8
126 changed files with 1210 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Core/Routing/DefaultUrlProvider.cs
View File

@@ -137,9 +137,12 @@ public class DefaultUrlProvider : IUrlProvider
{
if (string.IsNullOrWhiteSpace(route))
{
_logger.LogDebug(
if (_logger.IsEnabled(Microsoft.Extensions.Logging.LogLevel.Debug))
{
_logger.LogDebug(
"Couldn't find any page with nodeId={NodeId}. This is most likely caused by the page not being published.",
id);
}
return null;
}

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

@@ -250,9 +250,12 @@ public static class UrlProviderExtensions
if (!pcr.HasPublishedContent())
{
const string logMsg = nameof(DetectCollisionAsync) +
if (logger.IsEnabled(Microsoft.Extensions.Logging.LogLevel.Debug))
{
const string logMsg = nameof(DetectCollisionAsync) +
" did not resolve a content item for original url: {Url}, translated to {TranslatedUrl} and culture: {Culture}";
logger.LogDebug(logMsg, url, uri, culture);
logger.LogDebug(logMsg, url, uri, culture);
}
var urlInfo = UrlInfo.Message(textService.Localize("content", "routeErrorCannotRoute"), culture);
return Attempt.Succeed(urlInfo);