From add2ecdf8bb977a0234cf773b578eae9872a0d28 Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dhensby@silverstripe.com>
Date: Fri, 18 Mar 2016 15:56:39 +0000
Subject: [PATCH] FIX Parameter tokens now redirect to correct url if
 mod_rewrite is off

---
 core/startup/ParameterConfirmationToken.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/startup/ParameterConfirmationToken.php b/core/startup/ParameterConfirmationToken.php
index d65c32c4d..03b032c75 100644
--- a/core/startup/ParameterConfirmationToken.php
+++ b/core/startup/ParameterConfirmationToken.php
@@ -191,8 +191,8 @@ class ParameterConfirmationToken {
 			$_SERVER['HTTP_HOST'],
 			// SilverStripe base
 			self::$alternateBaseURL !== null ? self::$alternateBaseURL : BASE_URL,
-			// And URL
-			$url
+			// And URL including base script (eg: if it's index.php/page/url/)
+			(defined('BASE_SCRIPT_URL') ? '/' . BASE_SCRIPT_URL : '') . $url,
 		));
 
 		// Join together with protocol into our current absolute URL, avoiding duplicated "/" characters