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

This commit is contained in:
Stephan
2016-11-03 10:31:44 +01:00
412 changed files with 12532 additions and 5381 deletions

View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Xml.XPath;
using Umbraco.Core.Models.PublishedContent;
using Umbraco.Core.Xml;
@@ -22,6 +23,13 @@ namespace Umbraco.Web.PublishedCache
return GetById(PreviewDefault, contentId);
}
public abstract IPublishedContent GetById(bool preview, Guid contentId);
public IPublishedContent GetById(Guid contentId)
{
return GetById(PreviewDefault, contentId);
}
public abstract bool HasById(bool preview, int contentId);
public bool HasById(int contentId)