Merge pull request #3962 from micmania1/patch-8

FIX Prevent unnecessary call to config system which doesn't exist yet
This commit is contained in:
Damian Mooyman 2015-03-06 12:42:20 +13:00
commit ba2de450d6

View File

@ -85,8 +85,6 @@ require_once 'control/injector/Injector.php';
// Initialise the dependency injector as soon as possible, as it is // Initialise the dependency injector as soon as possible, as it is
// subsequently used by some of the following code // subsequently used by some of the following code
$injector = new Injector(array('locator' => 'SilverStripeServiceConfigurationLocator')); $injector = new Injector(array('locator' => 'SilverStripeServiceConfigurationLocator'));
$injector->registerService(Config::inst());
Injector::set_inst($injector); Injector::set_inst($injector);
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////