Permalink
Browse files

FIX Token redirect where in IIS a / needs adding between host & url

  • Loading branch information...
1 parent a685a8d commit 041466fe024ade10f085f247e67d6f459a9f48ed Hamish Friedlander committed Aug 4, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 core/startup/ParameterConfirmationToken.php
@@ -91,7 +91,7 @@ public function reloadWithToken() {
unset($params['url']);
// Join them all together into the original URL
- $location = "$proto://" . $host . BASE_URL . $url . ($params ? '?'.http_build_query($params) : '');
+ $location = "$proto://" . $host . '/' . ltrim(BASE_URL, '/') . $url . ($params ? '?'.http_build_query($params) : '');
// And redirect
if (headers_sent()) {

1 comment on commit 041466f

@ARNHOE
Contributor
ARNHOE commented on 041466f Aug 8, 2013

@hafriedlander @chillu Excuse me if I am wrong, but I have a feeling this commit might be the cause of the following problem on Mac OS X MAMP Pro

When I start with http://mysite.com/dev/build?flush=all after the redirect it ends up with a double slash, http://mysite.com//dev/build?flush=all&flushtoken=

Please sign in to comment.