diff --git a/app/code/core/Mage/Core/Model/Config.php b/app/code/core/Mage/Core/Model/Config.php index e424cfca3b3d0..80f6b594cd41c 100644 --- a/app/code/core/Mage/Core/Model/Config.php +++ b/app/code/core/Mage/Core/Model/Config.php @@ -341,9 +341,16 @@ public function loadModules() Magento_Profiler::start('config'); Magento_Profiler::start('load_modules'); $this->_loadDeclaredModules(); - + $resourceConfig = sprintf('config.%s.xml', $this->_getResourceConnectionModel('core')); - $this->loadModulesConfiguration(array('config.xml',$resourceConfig), $this); + + $configFiles = array('config.xml',$resourceConfig); + + if (($environment = getenv('MAGE_ENVIRONMENT'))) { + $configFiles[] = sprintf('config.%s.xml', $environment); + } + + $this->loadModulesConfiguration($configFiles, $this); /** * Prevent local.xml directives overwriting