Merge branch 'refs/heads/1.10.x' into dev

# Conflicts: # src/Orchard/Data/Migration/AutomaticDataMigrations.cs
OrchardCMS · Oct 17, 2016 · 5c430ef · 5c430ef
2 parents ca9fb77 + 59a9f0b
commit 5c430ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...Orchard.Web/Modules/Orchard.DesignerTools/Handlers/ShapeTracingSiteSettingsPartHandler.cs b/...Orchard.Web/Modules/Orchard.DesignerTools/Handlers/ShapeTracingSiteSettingsPartHandler.cs
@@ -28,7 +28,6 @@ protected override void GetItemMetadata(GetContentItemMetadataContext context) {
             base.GetItemMetadata(context);
 
             var groupInfo = new GroupInfo(T("Shape Tracing"));
-            groupInfo.Id = "ShapeTracing";
 
             context.Metadata.EditorGroupInfo.Add(groupInfo);
         }

diff --git a/src/Orchard/Data/Migration/AutomaticDataMigrations.cs b/src/Orchard/Data/Migration/AutomaticDataMigrations.cs
@@ -80,7 +80,8 @@ public void Terminating() {
         /// <summary>
         /// This ensures that the framework migrations have run for the distributed locking feature, as existing Orchard installations will not have the required tables when upgrading.
         /// </summary>
-        private void EnsureDistributedLockSchemaExists() {
+        private void EnsureDistributedLockSchemaExists()
+        {
             // Ensure the distributed lock record schema exists.
             var schemaBuilder = new SchemaBuilder(_dataMigrationInterpreter);
             var distributedLockSchemaBuilder = new DistributedLockSchemaBuilder(_shellSettings, schemaBuilder);
@@ -93,6 +94,8 @@ private void EnsureDistributedLockSchemaExists() {
                     return;
                 }
 
+                distributedLockSchemaBuilder.CreateSchema();
+
                 distributedLockSchemaBuilder.CreateSchema();
                 _transactionManager.RequireNew();
             }