Merge remote-tracking branch 'origin/dev-5' into dev-5

baserproject · Mar 6, 2024 · 8f8880f · 8f8880f
2 parents ef7a630 + 32cfe23
commit 8f8880f
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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");