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

SiteDomainHelper cleanup (#10166)

Browse Source 
* Fixes SiteDomainHelper = no more static weirdness and renames it.

* fix build
This commit is contained in:
Shannon Deminick
2021-04-22 20:25:25 +10:00
committed by GitHub
parent 181c8cbc34
commit c991e83088
27 changed files with 314 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,8 +32,8 @@ namespace Umbraco.Extensions
private static IUmbracoContextAccessor UmbracoContextAccessor { get; } =
StaticServiceProvider.Instance.GetRequiredService<IUmbracoContextAccessor>();
private static ISiteDomainHelper SiteDomainHelper { get; } =
StaticServiceProvider.Instance.GetRequiredService<ISiteDomainHelper>();
private static ISiteDomainMapper SiteDomainHelper { get; } =
StaticServiceProvider.Instance.GetRequiredService<ISiteDomainMapper>();
private static IExamineManager ExamineManager { get; } =
StaticServiceProvider.Instance.GetRequiredService<IExamineManager>();

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

@@ -47,7 +47,7 @@ namespace Umbraco.Extensions
/// one document per culture), and domains, withing the context of a current Uri, assign
/// a culture to that document.</para>
/// </remarks>
public static string GetCultureFromDomains(this IPublishedContent content, IUmbracoContextAccessor umbracoContextAccessor, ISiteDomainHelper siteDomainHelper, Uri current = null)
public static string GetCultureFromDomains(this IPublishedContent content, IUmbracoContextAccessor umbracoContextAccessor, ISiteDomainMapper siteDomainHelper, Uri current = null)
=> DomainUtilities.GetCultureFromDomains(content.Id, content.Path, current, umbracoContextAccessor.UmbracoContext, siteDomainHelper);
#endregion