U4-10128 - GetKey unwraps

2017-07-19 11:51:46 +02:00
parent 91fa583f62
commit 82661d9af4
1 changed files with 13 additions and 0 deletions
--- a/src/Umbraco.Web/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web/PublishedContentExtensions.cs
@@ -24,7 +24,20 @@ namespace Umbraco.Web

        public static Guid GetKey(this IPublishedContent content)
        {
+            // fast
            var contentWithKey = content as IPublishedContentWithKey;
+            if (contentWithKey != null) return contentWithKey.Key;
+
+            // try to unwrap (models...)
+            var contentWrapped = content as PublishedContentWrapped;
+            while (contentWrapped != null)
+            {
+                content = contentWrapped.Unwrap();
+                contentWrapped = content as PublishedContentWrapped;
+            }
+
+            // again
+            contentWithKey = content as IPublishedContentWithKey;
            return contentWithKey == null ? Guid.Empty : contentWithKey.Key;
        }