Fix #547: Empty placeholder content is shown after for a newly added …

…page version
Orckestra · Feb 26, 2018 · 6322367 · 6322367
1 parent 0220d68
commit 6322367
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/Composite/Data/PageManager.cs b/Composite/Data/PageManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -197,21 +197,24 @@ public static ReadOnlyCollection<IPagePlaceholderContent> GetPlaceholderContent(
         public static ReadOnlyCollection<IPagePlaceholderContent> GetPlaceholderContent(Guid pageId, Guid versionId)
         {
             string cacheKey = GetCacheKey<IPagePlaceholderContent>(pageId, versionId);
-            var cachedValue = _placeholderCache.Get(cacheKey);
-            if (cachedValue != null)
+            var result = _placeholderCache.Get(cacheKey);
+
+            if (result == null)
             {
-                return cachedValue;
-            }
+                using (var conn = new DataConnection())
+                {
+                    conn.DisableServices();
 
-            var list = DataFacade.GetData<IPagePlaceholderContent>(false)
-                .Where(f => f.PageId == pageId 
-                            && f.VersionId == versionId).ToList();
+                    var list = DataFacade.GetData<IPagePlaceholderContent>(false)
+                        .Where(f => f.PageId == pageId && f.VersionId == versionId).ToList();
 
-            var readonlyList = new ReadOnlyCollection<IPagePlaceholderContent>(list);
+                    result = new ReadOnlyCollection<IPagePlaceholderContent>(list);
+                }
 
-            _placeholderCache.Add(cacheKey, readonlyList);
+                _placeholderCache.Add(cacheKey, result);
+            }
 
-            return readonlyList;
+            return result;
         }
 
         #endregion Public