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

Merge branch '7.0.0' into 7.0.0-pubcontent

Browse Source 
Conflicts:
	src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
	src/Umbraco.Core/PublishedContentHelper.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web/Models/XmlPublishedContent.cs
	src/Umbraco.Web/Models/XmlPublishedContentProperty.cs
	src/Umbraco.Web/Templates/TemplateUtilities.cs
This commit is contained in:
Stephan
2013-09-26 08:57:01 +02:00
parent 042973ce19 fb811ce810
commit 36d6e4b4da
397 changed files with 1228 additions and 11490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Tests/CodeFirst/Definitions/ContentTypeDefinitionFactory.cs
View File

@@ -311,7 +311,7 @@ namespace Umbraco.Tests.CodeFirst.Definitions
private static IEnumerable<ITemplate> AllowedTemplatesConvention(IEnumerable<string> templateNames)
{
var templates = new List<ITemplate>();
var engine = UmbracoConfiguration.Current.UmbracoSettings.Templates.DefaultRenderingEngine;
var engine = UmbracoConfig.For.UmbracoSettings().Templates.DefaultRenderingEngine;
foreach (var templateName in templateNames)
{
var @alias = engine == RenderingEngine.Mvc