Merge remote-tracking branch 'origin/develop' into feature/restructure-dev-tree

Author: leekelleher

src/Our.Umbraco.DocTypeGridEditor/Helpers/DocTypeGridEditorHelper.cs

@@ -27,9 +27,19 @@ public static IPublishedContent ConvertValueToContent(string id, string docTypeA
             if (string.IsNullOrWhiteSpace(docTypeAlias))
                 return null;
 
+           if (UmbracoContext.Current != null)
+           {
             return (IPublishedContent)ApplicationContext.Current.ApplicationCache.RequestCache.GetCacheItem(
                 "DocTypeGridEditorHelper.ConvertValueToContent_" + id + "_" + docTypeAlias, () =>
                 {
+                   return ConvertValue(id, docTypeAlias, dataJson);
+                 });
+            }
+                return (IPublishedContent) ConvertValue(id, docTypeAlias, dataJson);
+        }
+
+        private static IPublishedContent ConvertValue(string id, string docTypeAlias, string dataJson)
+        {
                     using (var timer =  DisposableTimer.DebugDuration<DocTypeGridEditorHelper>(string.Format("ConvertValueToContent ({0}, {1})", id, docTypeAlias)))
                     {
                         Guid docTypeGuid;
@@ -83,15 +93,15 @@ public static IPublishedContent ConvertValueToContent(string id, string docTypeA
                         }
 
                         // Get the current request node we are embedded in
-                        var pcr = UmbracoContext.Current.PublishedContentRequest;
+                        var pcr = UmbracoContext.Current == null ? null : UmbracoContext.Current.PublishedContentRequest;
                         var containerNode = pcr != null && pcr.HasPublishedContent ? pcr.PublishedContent : null;
 
                         return new DetachedPublishedContent(nameObj == null ? null : nameObj.ToString(), 
                             publishedContentType,
                             properties.ToArray(),
                             containerNode);
                     }
-                });
+
         }
     }
-}
+}