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 #5200 from dhensby/pulls/fix-token-redirect

Browse Source 
FIX Parameter tokens now redirect to correct url if mod_rewrite is off
This commit is contained in:
Damian Mooyman 2016-03-21 14:45:03 +13:00
commit cdedee130a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/startup/ParameterConfirmationToken.php
View File

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