Fixes merge issues

This commit is contained in:
Shannon Deminick
2013-04-02 23:08:43 +06:00
parent a7e939e71f
commit 182107286c
6 changed files with 9 additions and 24 deletions

View File

@@ -334,7 +334,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
{
if (_previewContent == null)
{
_previewContent = new PreviewContent(user, new Guid(global::umbraco.BusinessLogic.StateHelper.Cookies.Preview.GetValue()), true);
_previewContent = new PreviewContent(user, new Guid(StateHelper.Cookies.Preview.GetValue()), true);
if (_previewContent.ValidPreviewSet)
_previewContent.LoadPreviewset();
}