From 32cfe234305dbc19a225bdc214347a0a60ecec5b Mon Sep 17 00:00:00 2001
From: seto1 <30764014+seto1@users.noreply.github.com>
Date: Tue, 5 Mar 2024 18:36:31 +0900
Subject: [PATCH] =?UTF-8?q?=E8=AA=8D=E8=A8=BC=E5=A4=B1=E6=95=97=E6=99=82?=
 =?UTF-8?q?=E3=81=AE=E3=83=AA=E3=83=80=E3=82=A4=E3=83=AC=E3=82=AF=E3=83=88?=
 =?UTF-8?q?=E5=85=88=E3=81=AE=E8=AA=BF=E6=95=B4=20(#3198)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/baser-core/src/Controller/AppController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/baser-core/src/Controller/AppController.php b/plugins/baser-core/src/Controller/AppController.php
index f701ee8d9b..7a2d43b4dc 100644
--- a/plugins/baser-core/src/Controller/AppController.php
+++ b/plugins/baser-core/src/Controller/AppController.php
@@ -175,7 +175,9 @@ public function beforeFilter(EventInterface $event)
                 }
                 // リファラが存在する場合はリファラにリダイレクトする
                 // $this->referer() で判定した場合、リファラがなくてもトップのURLが返却されるため ServerRequest で判定
-                if ($this->getRequest()->getEnv('HTTP_REFERER')) {
+                if ($this->getRequest()->getEnv('HTTP_REFERER') &&
+                    $this->getRequest()->getAttribute('here') !== $this->referer()
+                ) {
                     $url = $this->referer();
                 } else {
                     $url = Configure::read("BcPrefixAuth.{$prefix}.loginRedirect");