From 9d550f89384759a9f174b4d79bdb4b2bd7e6c823 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 6 Nov 2013 09:46:30 +0100 Subject: [PATCH] Fixed merge error --- control/Director.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/control/Director.php b/control/Director.php index 482a9f480..f9f2410f3 100644 --- a/control/Director.php +++ b/control/Director.php @@ -1029,8 +1029,8 @@ class Director implements TemplateGlobalProvider { return false; } - if(self::$environment_type) { - return self::$environment_type == 'test'; + if(Config::inst()->get('Director', 'environment_type')) { + return Config::inst()->get('Director', 'environment_type') == 'test'; } // Check if we are running on one of the test servers