Fix 318645 bug

SitecoreSupport · Mar 22, 2019 · 3d33404 · 3d33404
1 parent 8a9f615
commit 3d33404
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/Sitecore.Support.315324/InjectCompositeComponents.cs b/src/Sitecore.Support.315324/InjectCompositeComponents.cs
@@ -19,9 +19,15 @@ public override List<XElement> GetDevices(XElement layoutXml, ID contextDeviceId
       #endregion
 
       devices = FilterDevicesByDeviceId(devices, contextDeviceId);
-      if (!devices.Any() && Context.Device.FallbackDevice != null)
+
+      if (!devices.Any())
       {
-        return GetDevices(layoutXml, Context.Device.FallbackDevice.ID);
+        var fallbackDevice = Context.Database.Resources.Devices[contextDeviceId]?.FallbackDevice; // Sitecore.Support.318645
+
+        if (fallbackDevice != null)
+        {
+          return GetDevices(layoutXml, fallbackDevice.ID); // Sitecore.Support.318645
+        }
       }
       return devices;
     }