Skip to content

Commit

Permalink
bug #17048 Fix the logout path when not using the router (stof)
Browse files Browse the repository at this point in the history
This PR was merged into the 2.3 branch.

Discussion
----------

Fix the logout path when not using the router

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #17029
| License       | MIT
| Doc PR        | n/a

This needs to use the base url, not the base path, so that it goes through the front controller when not using url rewriting.

Commits
-------

1a2567e Fix the logout path when not using the router
  • Loading branch information
nicolas-grekas committed Dec 18, 2015
2 parents e69491c + 1a2567e commit c2b7ccb
Showing 1 changed file with 1 addition and 1 deletion.
Expand Up @@ -101,7 +101,7 @@ private function generateLogoutUrl($key, $referenceType)
if ('/' === $logoutPath[0]) {
$request = $this->container->get('request');

$url = UrlGeneratorInterface::ABSOLUTE_URL === $referenceType ? $request->getUriForPath($logoutPath) : $request->getBasePath().$logoutPath;
$url = UrlGeneratorInterface::ABSOLUTE_URL === $referenceType ? $request->getUriForPath($logoutPath) : $request->getBaseUrl().$logoutPath;

if (!empty($parameters)) {
$url .= '?'.http_build_query($parameters);
Expand Down

0 comments on commit c2b7ccb

Please sign in to comment.