Reverted r63388

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63389 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2008-09-30 03:28:50 +00:00
parent 813679cc9b
commit 1754e6cf81

View File

@ -503,14 +503,13 @@ class Director {
* Force a redirect to a domain starting with "www." * Force a redirect to a domain starting with "www."
*/ */
static function forceWWW() { static function forceWWW() {
if(!Director::isDev() && !Director::isTest() && strpos($_SERVER['SERVER_NAME'], 'www') !== 0) { if(!Director::isDev() && !Director::isTest() && strpos( $_SERVER['SERVER_NAME'], 'www') !== 0 ){
if(!empty($_SERVER['HTTPS'])) { if( $_SERVER['HTTPS'] )
$destURL = str_replace('https://', 'https://www.', Director::absoluteURL($_SERVER['REQUEST_URI'])); $destURL = str_replace('https://','https://www.',Director::absoluteURL($_SERVER['REQUEST_URI']));
} else { else
$destURL = str_replace('http://', 'http://www.', Director::absoluteURL($_SERVER['REQUEST_URI'])); $destURL = str_replace('http://','http://www.',Director::absoluteURL($_SERVER['REQUEST_URI']));
}
header("Location: $destURL", true, 301); header("Location: $destURL");
die("<h1>Your browser is not accepting header redirects</h1><p>Please <a href=\"$destURL\">click here</a>"); die("<h1>Your browser is not accepting header redirects</h1><p>Please <a href=\"$destURL\">click here</a>");
} }
} }