Ensure comments are only inserted when necessary

Fix #4219
dnnsoftware · Oct 19, 2020 · a9d2dd7 · a9d2dd7
1 parent 4e657a8
commit a9d2dd7
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/DNN Platform/Library/Services/Installer/XmlMerge.cs b/DNN Platform/Library/Services/Installer/XmlMerge.cs
@@ -8,7 +8,8 @@ namespace DotNetNuke.Services.Installer
     using System.Diagnostics;
     using System.IO;
     using System.Linq;
-    using System.Xml;
+    using System.Xml;
+    using System.Xml.Linq;
 
     using DotNetNuke.Application;
     using DotNetNuke.Common;
@@ -629,18 +630,25 @@ private bool UpdateNode(XmlNode rootNode, XmlNode actionNode)
                             var newContent = rootNode.InnerXml;
                             changedNode = !string.Equals(oldContent, newContent, StringComparison.Ordinal);
                             break;
-                        case "save":
+                        case "save":
+                            var newChild = this.TargetConfig.ImportNode(child, true);
+                            var targetXElement = XElement.Load(targetNode.CreateNavigator().ReadSubtree());
+                            var newXElement = XElement.Load(newChild.CreateNavigator().ReadSubtree());
+
+                            if (XElement.DeepEquals(targetXElement, newXElement))
+                            {
+                                break;
+                            }
+
                             string commentHeaderText = string.Format(
                                 Localization.GetString("XMLMERGE_Upgrade", Localization.SharedResourceFile),
                                 Environment.NewLine,
                                 this.Sender,
                                 this.Version,
                                 DateTime.Now);
                             XmlComment commentHeader = this.TargetConfig.CreateComment(commentHeaderText);
-
                             var targetNodeContent = this.GetNodeContentWithoutComment(targetNode);
                             XmlComment commentNode = this.TargetConfig.CreateComment(targetNodeContent);
-                            var newChild = this.TargetConfig.ImportNode(child, true);
                             rootNode.ReplaceChild(newChild, targetNode);
                             rootNode.InsertBefore(commentHeader, newChild);
                             rootNode.InsertBefore(commentNode, newChild);