Only redirect for non-ajax requests

Author: brandonkelly

src/controllers/ElementsController.php

@@ -2503,7 +2503,6 @@ private function _element(
         $draftId = $elementInfo['draftId'] ?? $this->_draftId;
         $revisionId = $elementInfo['revisionId'] ?? $this->_revisionId;
         $provisional = $elementInfo['isProvisionalDraft'] ?? $this->_provisional;
-        $ensureReturnElement = $elementInfo['ensureReturnElement'] ?? false;
 
         if (!$elementType) {
             if ($elementId) {
@@ -2581,12 +2580,11 @@ private function _element(
                     $siteId,
                     $preferSites,
                 );
-                if ($element) {
-                    if ($ensureReturnElement) {
-                        return $element;
-                    } elseif ($elementsService->canView($element, $user)) {
+                if ($element && $elementsService->canView($element, $user)) {
+                    if (!$this->request->getAcceptsJson()) {
                         return $this->redirect($element->getCpEditUrl());
                     }
+                    return $element;
                 }
                 throw new BadRequestHttpException($draftId ? "Invalid draft ID: $draftId" : "Invalid revision ID: $revisionId");
             }
@@ -2613,7 +2611,12 @@ private function _element(
             throw new ForbiddenHttpException('User not authorized to edit this element.');
         }
 
-        if (!$strictSite && isset($site) && $element->siteId !== $site->id) {
+        if (
+            !$strictSite &&
+            isset($site) &&
+            $element->siteId !== $site->id &&
+            !$this->request->getAcceptsJson()
+        ) {
             return $this->redirect($element->getCpEditUrl());
         }
 

src/fields/Matrix.php

@@ -961,7 +961,6 @@ protected function actionMenuItems(): array
         revisionId: element.data('revisionId'),
         ownerId: element.data('ownerId'),
         siteId: element.data('siteId'),
-        ensureReturnElement: true,
       }, $baseInfo));
   });
   Craft.cp.copyElements(elementInfo);

src/web/assets/matrix/dist/MatrixInput.js

@@ -1055,7 +1055,6 @@
                 fieldId: entry.matrix.settings.fieldId,
                 ownerId: entry.matrix.settings.ownerId,
                 siteId: entry.matrix.settings.siteId,
-                ensureReturnElement: true,
               });
             }
           } else {
@@ -1070,7 +1069,6 @@
                 fieldId: this.matrix.settings.fieldId,
                 ownerId: this.matrix.settings.ownerId,
                 siteId: this.matrix.settings.siteId,
-                ensureReturnElement: true,
               },
             ];
           }