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

Merge branch temp8 into temp8-di2690

Browse Source
This commit is contained in:
Stephan
2018-12-07 09:52:46 +01:00
parent c6a9701e53 fb4717d31e
commit 710ec704b3
183 changed files with 7053 additions and 6809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web/UI/Controls/UmbracoControl.cs
View File

@@ -15,10 +15,10 @@ namespace Umbraco.Web.UI.Controls
{
private UrlHelper _url;
protected UmbracoControl(UmbracoContext umbracoContext, ServiceContext services, CacheHelper appCache)
protected UmbracoControl(UmbracoContext umbracoContext, ServiceContext services)
{
UmbracoContext = umbracoContext ?? throw new ArgumentNullException(nameof(umbracoContext));
Umbraco = new UmbracoHelper(umbracoContext, services, appCache);
Umbraco = new UmbracoHelper(umbracoContext, services);
// fixme inject somehow
Logger = Current.Logger;
@@ -30,7 +30,7 @@ namespace Umbraco.Web.UI.Controls
/// Empty constructor, uses Singleton to resolve the UmbracoContext.
/// </summary>
protected UmbracoControl()
: this(Current.UmbracoContext, Current.Services, Current.ApplicationCache)
: this(Current.UmbracoContext, Current.Services)
{ }
/// <summary>