Skip to content

Commit 81552d6

Browse files
Merge branch '2.8' into 3.0
* 2.8: prefer phpunit 5.x on hhvm Reflected the change of the choice_value option in the Upgrade information [FrameworkBundle][HttpKernel] the finder is required to discover bundle commands [travis] Auto-conf deps=high matrix line fix error level for deprecation Fix the logout path when not using the router Fix the logout path when not using the router [Form] cast IDs to match deprecated behaviour of EntityChoiceList [FrameworkBundle] minor: fix property_info service name in composer.json [HttpFoundation] Added the ability of mapping stream wrapper protocols when using X-Sendfile [HttpFoundation] Add a test case for using BinaryFileResponse with stream wrappers CSS min-height and min-width should not be "auto" Conflicts: .travis.yml UPGRADE-2.8.md appveyor.yml src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/HttpFoundation/ParameterBag.php
2 parents 51b4f35 + 689a71f commit 81552d6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Logout/LogoutUrlGenerator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ private function generateLogoutUrl($key, $referenceType)
113113

114114
$request = $this->requestStack->getCurrentRequest();
115115

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

118118
if (!empty($parameters)) {
119119
$url .= '?'.http_build_query($parameters);

0 commit comments

Comments
 (0)