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

nullref fixes

Browse Source
This commit is contained in:
Bjarke Berg
2019-02-18 10:58:06 +01:00
parent 08d4747824
commit 050616f446
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/Editors/Filters/UserGroupAuthorizationAttribute.cs
View File

@@ -35,7 +35,7 @@ namespace Umbraco.Web.Editors.Filters
private UmbracoContext GetUmbracoContext()
{
return _umbracoContextAccessor.UmbracoContext ?? Composing.Current.UmbracoContext;
return _umbracoContextAccessor?.UmbracoContext ?? Composing.Current.UmbracoContext;
}
protected override bool IsAuthorized(HttpActionContext actionContext)

2
src/Umbraco.Web/Install/InstallAuthorizeAttribute.cs
View File

@@ -19,7 +19,7 @@ namespace Umbraco.Web.Install
private IRuntimeState RuntimeState => _runtimeState ?? Current.RuntimeState;
private UmbracoContext UmbracoContext => _umbracoContextAccessor.UmbracoContext ?? Current.UmbracoContext;
private UmbracoContext UmbracoContext => _umbracoContextAccessor?.UmbracoContext ?? Current.UmbracoContext;
/// <summary>
/// THIS SHOULD BE ONLY USED FOR UNIT TESTS

2
src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
View File

@@ -69,7 +69,7 @@ namespace Umbraco.Web.Mvc
/// <summary>
/// Exposes the UmbracoContext
/// </summary>
protected UmbracoContext UmbracoContext => _umbracoContextAccessor.UmbracoContext ?? Current.UmbracoContext;
protected UmbracoContext UmbracoContext => _umbracoContextAccessor?.UmbracoContext ?? Current.UmbracoContext;
// TODO: try lazy property injection?
private IPublishedRouter PublishedRouter => Core.Composing.Current.Factory.GetInstance<IPublishedRouter>();