apply draft - element can be a response

craftcms · Jun 4, 2024 · 11ddae4 · 11ddae4
1 parent a41b83e
commit 11ddae4
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/controllers/ElementsController.php b/src/controllers/ElementsController.php
@@ -1634,9 +1634,14 @@ public function actionApplyDraft(): ?Response
         $this->requirePostRequest();
         $elementsService = Craft::$app->getElements();
 
-        /** @var Element|DraftBehavior|null $element */
+        /** @var Element|DraftBehavior|Response|null $element */
         $element = $this->_element();
 
+        // this can happen if creating element via slideout, and we hit "create entry" before the autosave kicks in
+        if ($element instanceof Response) {
+            return $element;
+        }
+
         if (!$element || !$element->getIsDraft()) {
             throw new BadRequestHttpException('No draft was identified by the request.');
         }