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.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
View File

@@ -227,7 +227,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
// that switch schemas fail - so cache and refresh when needed,
// ie never when running the actual site
var version = UmbracoConfiguration.Current.UmbracoSettings.Content.UseLegacyXmlSchema ? 0 : 1;
var version = UmbracoConfig.For.UmbracoSettings().Content.UseLegacyXmlSchema ? 0 : 1;
if (_xPathStringsValue == null || _xPathStringsValue.Version != version)
_xPathStringsValue = new XPathStringsDefinition(version);
return _xPathStringsValue;

2
src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
View File

@@ -257,7 +257,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
if (xpath == null) throw new ArgumentNullException("xpath");
var values = new Dictionary<string, string> {{"nodeName", xpath.GetAttribute("nodeName", "")}};
if (!UmbracoConfiguration.Current.UmbracoSettings.Content.UseLegacyXmlSchema)
if (!UmbracoConfig.For.UmbracoSettings().Content.UseLegacyXmlSchema)
{
values.Add("nodeTypeAlias", xpath.Name);
}