From 4418bcdc191552b6b061a9675df12e0585e79751 Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipke@ideliverable.com>
Date: Tue, 22 Dec 2015 20:21:28 +0100
Subject: [PATCH] Fixed a bug in LayoutModelMapper.

If the root Canvas is manually instantiated, it will not have a valid ElementDescriptor.
---
 .../Modules/Orchard.Layouts/Services/LayoutModelMapper.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Services/LayoutModelMapper.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Services/LayoutModelMapper.cs
index 8d05c73f2..e5dafd564 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Services/LayoutModelMapper.cs
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Services/LayoutModelMapper.cs
@@ -20,7 +20,7 @@ namespace Orchard.Layouts.Services {
 
         public object ToEditorModel(string layoutData, DescribeElementsContext describeContext) {
             var elements = _serializer.Deserialize(layoutData, describeContext);
-            var canvas = elements.FirstOrDefault(x => x is Canvas) ?? new Canvas();
+            var canvas = elements.FirstOrDefault(x => x is Canvas) ?? _elementManager.ActivateElement<Canvas>();
             return ToEditorModel(canvas, describeContext);
         }