From a462cd2c2015123c2847fba5a82097bbd690e8bf Mon Sep 17 00:00:00 2001 From: Andrew O'Neil Date: Sun, 4 Nov 2007 21:15:41 +0000 Subject: [PATCH] Use the hostname, not the ip address, in dev/test mode tests (merged from 2.1.1 branch, r43542) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44194 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/control/Director.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/core/control/Director.php b/core/control/Director.php index 312df5542..cdf89bc1c 100644 --- a/core/control/Director.php +++ b/core/control/Director.php @@ -442,16 +442,18 @@ class Director { return true; } } - + if(isset($_SESSION['isDev']) && $_SESSION['isDev']) return true; // Check if we are running on one of the development servers - if(in_array($_SERVER['SERVER_ADDR'], Director::$dev_servers)) { + if(in_array($_SERVER['HTTP_HOST'], Director::$dev_servers)) { return true; } + + // Check if we are running on one of the test servers - if(in_array($_SERVER['SERVER_ADDR'], Director::$test_servers)) { + if(in_array($_SERVER['HTTP_HOST'], Director::$test_servers)) { return true; } @@ -464,7 +466,7 @@ class Director { } // Check if we are running on one of the test servers - if(in_array($_SERVER['SERVER_ADDR'], Director::$test_servers)) { + if(in_array($_SERVER['HTTP_HOST'], Director::$test_servers)) { return true; }