Reset cached content elements when cloning a content items. (#17539)

OrchardCMS · Mar 3, 2025 · 0edcac8 · 0edcac8
1 parent 208107c
commit 0edcac8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentElement.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentElement.cs
@@ -18,7 +18,7 @@ protected ContentElement() : this([])
     {
     }
 
-    protected ContentElement(JsonObject data) => Data = data;
+    protected ContentElement(JsonObject data) => _data = data;
 
     [JsonIgnore]
     protected internal Dictionary<string, ContentElement> Elements => _elements ??= [];
@@ -33,6 +33,7 @@ internal JsonObject Data
         set
         {
             _dynamicObject = null;
+            _elements = null;
             _data = value;
         }
     }

diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentExtensions.cs
@@ -225,13 +225,13 @@ public static ContentElement Apply(this ContentElement contentElement, ContentEl
         if (contentElement.Data is not null)
         {
             contentElement.Data.Merge(JObject.FromObject(element.Data), _jsonMergeSettings);
+            contentElement.Elements.Clear();
         }
         else
         {
             contentElement.Data = JObject.FromObject(element.Data);
         }
 
-        contentElement.Elements.Clear();
         return contentElement;
     }