diff --git a/src/Controller/AbstractCrudController.php b/src/Controller/AbstractCrudController.php index 9c8ef5ca5d..75057354ba 100644 --- a/src/Controller/AbstractCrudController.php +++ b/src/Controller/AbstractCrudController.php @@ -387,7 +387,7 @@ public function delete(AdminContext $context) return $event->getResponse(); } - if (null !== $referrer = $context->getReferrer()) { + if (null !== $referrer = $context->getRequest()->headers->get('referrer')) { return $this->redirect($referrer); } @@ -450,7 +450,7 @@ public function batchDelete(AdminContext $context, BatchActionDto $batchActionDt return $event->getResponse(); } - return $this->redirect($batchActionDto->getReferrerUrl()); + return $this->redirect($context->getRequest()->headers->get('referer')); } public function autocomplete(AdminContext $context): JsonResponse @@ -638,7 +638,7 @@ protected function getRedirectResponseAfterSave(AdminContext $context, string $a ->setAction(Action::EDIT) ->setEntityId($context->getEntity()->getPrimaryKeyValue()) ->generateUrl(), - Action::SAVE_AND_RETURN => $context->getReferrer() + Action::SAVE_AND_RETURN => $context->getRequest()->headers->get('referer') ?? $this->container->get(AdminUrlGenerator::class)->setAction(Action::INDEX)->generateUrl(), Action::SAVE_AND_ADD_ANOTHER => $this->container->get(AdminUrlGenerator::class)->setAction(Action::NEW)->generateUrl(), default => $this->generateUrl($context->getDashboardRouteName()),