From eec888ff7116a2cfbbfe75bfa1df8157ed4428d9 Mon Sep 17 00:00:00 2001
From: Daniel Stolt <daniel@ideliverable.com>
Date: Thu, 30 Jul 2015 20:32:09 +0100
Subject: [PATCH] Made order of field and part elements in export XML
 predictable.

---
 .../Drivers/Coordinators/ContentFieldDriverCoordinator.cs     | 4 ++--
 .../Drivers/Coordinators/ContentPartDriverCoordinator.cs      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Orchard/ContentManagement/Drivers/Coordinators/ContentFieldDriverCoordinator.cs b/src/Orchard/ContentManagement/Drivers/Coordinators/ContentFieldDriverCoordinator.cs
index 670357342..8ffb8ec62 100644
--- a/src/Orchard/ContentManagement/Drivers/Coordinators/ContentFieldDriverCoordinator.cs
+++ b/src/Orchard/ContentManagement/Drivers/Coordinators/ContentFieldDriverCoordinator.cs
@@ -91,14 +91,14 @@ namespace Orchard.ContentManagement.Drivers.Coordinators {
 
         public override void Exporting(ExportContentContext context) {
             context.Logger = Logger;
-            foreach (var contentFieldDriver in _drivers) {
+            foreach (var contentFieldDriver in _drivers.OrderBy(x => x.GetFieldInfo().First().FieldTypeName)) {
                 contentFieldDriver.Exporting(context);
             }
         }
 
         public override void Exported(ExportContentContext context) {
             context.Logger = Logger;
-            foreach (var contentFieldDriver in _drivers) {
+            foreach (var contentFieldDriver in _drivers.OrderBy(x => x.GetFieldInfo().First().FieldTypeName)) {
                 contentFieldDriver.Exported(context);
             }
         }
diff --git a/src/Orchard/ContentManagement/Drivers/Coordinators/ContentPartDriverCoordinator.cs b/src/Orchard/ContentManagement/Drivers/Coordinators/ContentPartDriverCoordinator.cs
index ca7f49657..4be8c316c 100644
--- a/src/Orchard/ContentManagement/Drivers/Coordinators/ContentPartDriverCoordinator.cs
+++ b/src/Orchard/ContentManagement/Drivers/Coordinators/ContentPartDriverCoordinator.cs
@@ -79,13 +79,13 @@ namespace Orchard.ContentManagement.Drivers.Coordinators {
         }
 
         public override void Exporting(ExportContentContext context) {
-            foreach (var contentPartDriver in _drivers) {
+            foreach (var contentPartDriver in _drivers.OrderBy(x => x.GetPartInfo().First().PartName)) {
                 contentPartDriver.Exporting(context);
             }
         }
 
         public override void Exported(ExportContentContext context) {
-            foreach (var contentPartDriver in _drivers) {
+            foreach (var contentPartDriver in _drivers.OrderBy(x => x.GetPartInfo().First().PartName)) {
                 contentPartDriver.Exported(context);
             }
         }