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

Merge origin/dev-v7-deploy into dev-v8-zbwip (builds)

Browse Source
This commit is contained in:
Stephan
2016-11-03 10:31:44 +01:00
parent d44ee715a9 1aade7c27c
commit b26b415096
412 changed files with 12532 additions and 5381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web/Editors/UpdateCheckController.cs
View File

@@ -4,6 +4,7 @@ using System.Net.Http;
using System.Net.Http.Headers;
using System.Web.Http.Filters;
using Umbraco.Core.Configuration;
using Umbraco.Core.Models;
using Umbraco.Web.Models;
using Umbraco.Web.Mvc;
@@ -17,7 +18,7 @@ namespace Umbraco.Web.Editors
{
var updChkCookie = Request.Headers.GetCookies("UMB_UPDCHK").FirstOrDefault();
var updateCheckCookie = updChkCookie != null ? updChkCookie["UMB_UPDCHK"].Value : "";
if (GlobalSettings.VersionCheckPeriod > 0 && string.IsNullOrEmpty(updateCheckCookie) && Security.CurrentUser.UserType.Alias == "admin")
if (GlobalSettings.VersionCheckPeriod > 0 && string.IsNullOrEmpty(updateCheckCookie) && Security.CurrentUser.IsAdmin())
{
try
{