mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
parent
a7dfda2a85
commit
1053de7ec3
@ -810,9 +810,13 @@ class Director implements TemplateGlobalProvider {
|
|||||||
/**
|
/**
|
||||||
* Skip any further processing and immediately respond with a redirect to the passed URL.
|
* Skip any further processing and immediately respond with a redirect to the passed URL.
|
||||||
*
|
*
|
||||||
* @param string $destURL - The URL to redirect to
|
* @param string $destURL The URL to redirect to
|
||||||
|
* @return string URL redirected to if on CLI
|
||||||
*/
|
*/
|
||||||
protected static function force_redirect($destURL) {
|
protected static function force_redirect($destURL) {
|
||||||
|
if (static::is_cli()) {
|
||||||
|
return $destURL;
|
||||||
|
}
|
||||||
$response = new SS_HTTPResponse();
|
$response = new SS_HTTPResponse();
|
||||||
$response->redirect($destURL, 301);
|
$response->redirect($destURL, 301);
|
||||||
|
|
||||||
@ -859,9 +863,6 @@ class Director implements TemplateGlobalProvider {
|
|||||||
$matched = false;
|
$matched = false;
|
||||||
|
|
||||||
if($patterns) {
|
if($patterns) {
|
||||||
// Calling from the command-line?
|
|
||||||
if(!isset($_SERVER['REQUEST_URI'])) return;
|
|
||||||
|
|
||||||
$relativeURL = self::makeRelative(Director::absoluteURL($_SERVER['REQUEST_URI']));
|
$relativeURL = self::makeRelative(Director::absoluteURL($_SERVER['REQUEST_URI']));
|
||||||
|
|
||||||
// protect portions of the site based on the pattern
|
// protect portions of the site based on the pattern
|
||||||
@ -887,12 +888,7 @@ class Director implements TemplateGlobalProvider {
|
|||||||
|
|
||||||
$destURL = str_replace('http:', 'https:', Director::absoluteURL($url));
|
$destURL = str_replace('http:', 'https:', Director::absoluteURL($url));
|
||||||
|
|
||||||
// This coupling to SapphireTest is necessary to test the destination URL and to not interfere with tests
|
return self::force_redirect($destURL);
|
||||||
if(class_exists('SapphireTest', false) && SapphireTest::is_running_test()) {
|
|
||||||
return $destURL;
|
|
||||||
} else {
|
|
||||||
self::force_redirect($destURL);
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user