load config files from environment specific locations in core classes, helpers and libraries

1 files changed, 10 insertions, 1 deletions

diff --git a/system/core/Output.php b/system/core/Output.php
index 6644b3bff..82c821524 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -43,7 +43,16 @@ class CI_Output {
 		$this->_zlib_oc = @ini_get('zlib.output_compression');
 
 		// Get mime types for later
-		include APPPATH.'config/mimes'.EXT;
+		if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT))
+		{
+		    include APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT;
+		}
+		else
+		{
+			include APPPATH.'config/mimes'.EXT;
+		}
+		
+		
 		$this->mime_types = $mimes;
 		
 		log_message('debug', "Output Class Initialized");