Merge branch 'main' into ma/fis-system-defined

OrchardCMS · Nov 18, 2024 · d70aa44 · d70aa44
2 parents e3a0ed9 + bdf74c8
commit d70aa44
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/PublishContentTask.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/PublishContentTask.cs
@@ -33,7 +33,7 @@ public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecuti
         var content = (await GetContentAsync(workflowContext))
             ?? throw new InvalidOperationException($"The '{nameof(PublishContentTask)}' failed to retrieve the content item.");
 
-        if (string.Equals(InlineEvent.ContentItemId, content.ContentItem.ContentItemId, StringComparison.OrdinalIgnoreCase))
+        if (!content.HasDraft())
         {
             return Outcomes("Noop");
         }

diff --git a/src/OrchardCore.Modules/OrchardCore.XmlRpc/Controllers/HomeController.cs b/src/OrchardCore.Modules/OrchardCore.XmlRpc/Controllers/HomeController.cs
@@ -54,7 +54,7 @@ public async Task<IActionResult> ServiceEndpoint([ModelBinder(BinderType = typeo
             result.Save(w);
         }
 
-        var content = Encoding.UTF8.GetString(stream.GetBuffer(), 0, (int)stream.Length);
+        var content = Encoding.UTF8.GetString(stream.GetReadOnlySequence());
 
         return Content(content, "text/xml");
     }

diff --git a/src/OrchardCore/OrchardCore.ContentManagement/DefaultContentManager.cs b/src/OrchardCore/OrchardCore.ContentManagement/DefaultContentManager.cs
@@ -563,16 +563,17 @@ public async Task CreateAsync(ContentItem contentItem, VersionOptions options =
 
         options ??= VersionOptions.Published;
 
-        // Draft flag on create is required for explicitly-published content items
+        // Draft flag on create is required for explicitly-published content items.
         if (options.IsDraft)
         {
             contentItem.Published = false;
+            contentItem.Latest = true;
         }
 
-        // Build a context with the initialized instance to create
+        // Build a context with the initialized instance to create.
         var context = new CreateContentContext(contentItem);
 
-        // invoke handlers to add information to persistent stores
+        // invoke handlers to add information to persistent stores.
         await Handlers.InvokeAsync((handler, context) => handler.CreatingAsync(context), context, _logger);
 
         await _session.SaveAsync(contentItem);
@@ -584,10 +585,10 @@ public async Task CreateAsync(ContentItem contentItem, VersionOptions options =
         {
             var publishContext = new PublishContentContext(contentItem, null);
 
-            // invoke handlers to acquire state, or at least establish lazy loading callbacks
+            // invoke handlers to acquire state, or at least establish lazy loading callbacks.
             await Handlers.InvokeAsync((handler, context) => handler.PublishingAsync(context), publishContext, _logger);
 
-            // invoke handlers to acquire state, or at least establish lazy loading callbacks
+            // invoke handlers to acquire state, or at least establish lazy loading callbacks.
             await ReversedHandlers.InvokeAsync((handler, context) => handler.PublishedAsync(context), publishContext, _logger);
         }
     }