tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Fixed merge error

Browse Source
This commit is contained in:
Ingo Schommer 2013-11-06 09:46:30 +01:00
parent 91f6039eed
commit 9d550f8938
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
control/Director.php
View File

@ -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