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

Fixed 11 more classes with new TryGetUmbracoContext

Browse Source
This commit is contained in:
Zeegaan
2021-08-11 12:17:35 +02:00
parent 919b091e67
commit c3bac00f6e
11 changed files with 93 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Web.Common/Extensions/FriendlyPublishedContentExtensions.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Data;
using Examine;
@@ -50,7 +50,17 @@ namespace Umbraco.Extensions
private static IPublishedValueFallback PublishedValueFallback { get; } =
StaticServiceProvider.Instance.GetRequiredService<IPublishedValueFallback>();
private static IPublishedSnapshot PublishedSnapshot => UmbracoContextAccessor.UmbracoContext?.PublishedSnapshot;
private static IPublishedSnapshot PublishedSnapshot
{
get
{
if (!UmbracoContextAccessor.TryGetUmbracoContext(out var umbracoContext))
{
return null;
}
return umbracoContext.PublishedSnapshot;
}
}
private static IMediaTypeService MediaTypeService { get; } =
StaticServiceProvider.Instance.GetRequiredService<IMediaTypeService>();

8
src/Umbraco.Web.Common/Extensions/PublishedContentExtensions.cs
View File

@@ -48,7 +48,13 @@ namespace Umbraco.Extensions
/// a culture to that document.</para>
/// </remarks>
public static string GetCultureFromDomains(this IPublishedContent content, IUmbracoContextAccessor umbracoContextAccessor, ISiteDomainMapper siteDomainHelper, Uri current = null)
=> DomainUtilities.GetCultureFromDomains(content.Id, content.Path, current, umbracoContextAccessor.UmbracoContext, siteDomainHelper);
{
if (!umbracoContextAccessor.TryGetUmbracoContext(out var umbracoContext))
{
throw new InvalidOperationException("Wasn't able to get an UmbracoContext");
}
return DomainUtilities.GetCultureFromDomains(content.Id, content.Path, current, umbracoContext, siteDomainHelper);
}
#endregion