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

2016-11-03 10:31:44 +01:00
parent d44ee715a9 1aade7c27c
commit b26b415096
412 changed files with 12532 additions and 5381 deletions
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
@@ -209,6 +209,13 @@ namespace Umbraco.Web.PublishedCache.NuCache
                : n.Published;
        }

+        public override IPublishedContent GetById(bool preview, Guid nodeId)
+        {
+            // fixme - implement in a more efficient way
+            const string xpath = "//* [@isDoc and @key=$guid]";
+            return GetSingleByXPath(preview, xpath, new[] { new XPathVariable("guid", nodeId.ToString()) });
+        }
+
        public override bool HasById(bool preview, int contentId)
        {
            var n = _snapshot.Get(contentId);