From b675fbe1ec2b321bbdfe7c8f17d3c78c84319ee0 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Tue, 30 Sep 2008 03:31:29 +0000 Subject: [PATCH] MINOR Ticket #2869 Fixed PHP notice in Director::forceWWW() git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63390 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/control/Director.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/core/control/Director.php b/core/control/Director.php index 0f17e8018..fb33ab3f1 100644 --- a/core/control/Director.php +++ b/core/control/Director.php @@ -503,11 +503,12 @@ class Director { * Force a redirect to a domain starting with "www." */ static function forceWWW() { - if(!Director::isDev() && !Director::isTest() && strpos( $_SERVER['SERVER_NAME'], 'www') !== 0 ){ - if( $_SERVER['HTTPS'] ) - $destURL = str_replace('https://','https://www.',Director::absoluteURL($_SERVER['REQUEST_URI'])); - else - $destURL = str_replace('http://','http://www.',Director::absoluteURL($_SERVER['REQUEST_URI'])); + if(!Director::isDev() && !Director::isTest() && strpos($_SERVER['SERVER_NAME'], 'www') !== 0) { + if(!empty($_SERVER['HTTPS'])) { + $destURL = str_replace('https://', 'https://www.', Director::absoluteURL($_SERVER['REQUEST_URI'])); + } else { + $destURL = str_replace('http://', 'http://www.', Director::absoluteURL($_SERVER['REQUEST_URI'])); + } header("Location: $destURL"); die("

Your browser is not accepting header redirects

Please click here");