From 8fd41584681731c633eb0a5e80e696dc214fbda2 Mon Sep 17 00:00:00 2001 From: Ned Schwartz Date: Fri, 10 Jun 2011 14:32:10 -0700 Subject: [PATCH] storing localized targetPath in a string as opposed to updating the attribute --- .../Component/Security/Http/Firewall/LogoutListener.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php b/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php index efdc4c3061..2fea16d493 100644 --- a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php @@ -69,8 +69,8 @@ class LogoutListener implements ListenerInterface { $request = $event->getRequest(); - $this->targetUrl = str_replace('{_locale}', $request->getSession()->getLocale(), $this->targetUrl); - + $targetUrl = str_replace('{_locale}', $request->getSession()->getLocale(), $this->targetUrl); + if ($this->logoutPath !== $request->getPathInfo()) { return; } @@ -82,7 +82,7 @@ class LogoutListener implements ListenerInterface throw new \RuntimeException('Logout Success Handler did not return a Response.'); } } else { - $response = new RedirectResponse(0 !== strpos($this->targetUrl, 'http') ? $request->getUriForPath($this->targetUrl) : $this->targetUrl, 302); + $response = new RedirectResponse(0 !== strpos($targetUrl, 'http') ? $request->getUriForPath($targetUrl) : $targetUrl, 302); } // handle multiple logout attempts gracefully @@ -96,4 +96,3 @@ class LogoutListener implements ListenerInterface $event->setResponse($response); } -}