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

Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8

Browse Source 
# Conflicts:
#	src/Umbraco.Tests/FrontEnd/UmbracoHelperTests.cs
#	src/Umbraco.Web/UmbracoHelper.cs
This commit is contained in:
Shannon
2018-07-12 22:41:33 +10:00
parent 41407d27d0 39b2e6543c
commit a8ad55ef3c
2 changed files with 312 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Web/UmbracoHelper.cs
View File

@@ -8,15 +8,15 @@ using System.Web.Mvc;
using System.Xml.XPath;
using Umbraco.Core;
using Umbraco.Core.Dictionary;
using Umbraco.Core.Services;
using Umbraco.Core.Xml;
using Umbraco.Web.Routing;
using Umbraco.Web.Security;
using Umbraco.Core.Exceptions;
using Umbraco.Core.Models;
using Umbraco.Core.Models.PublishedContent;
using Umbraco.Core.Services;
using Umbraco.Core.Xml;
using Umbraco.Web.Composing;
using Umbraco.Core.Cache;
using Umbraco.Web.Routing;
using Umbraco.Web.Security;
namespace Umbraco.Web
{
@@ -673,6 +673,7 @@ namespace Umbraco.Web
guidId = default;
return false;
}
}
}