tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2728 from xini/2.4

Browse Source 
BUGFIX: URL '/' ending up beeing redirected to '//'
This commit is contained in:
Ingo Schommer 2013-12-19 11:02:45 -08:00
commit d0c37b3a13
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/startup/ParameterConfirmationToken.php
View File

@ -91,7 +91,7 @@ class ParameterConfirmationToken {
unset($params['url']);
// Join them all together into the original URL
$location = "$proto://" . $host . '/' . ltrim(BASE_URL, '/') . $url . ($params ? '?'.http_build_query($params) : '');
$location = "$proto://" . $host . (strlen(trim(BASE_URL, '/')) > 0 ? '/' . trim(BASE_URL, '/') : '' ) . (strlen(trim($url, '/')) > 0 ? '/' . trim($url, '/') : '' ) . ($params ? '?'.http_build_query($params) : '');
// And redirect
if (headers_sent()) {