Revert "Abstracting the loading of files in the config directory depending on environments."

This reverts commit 5c1aa631c5f5ec2f6b75ba1158178418e50ba11a.

1 files changed, 9 insertions, 1 deletions

diff --git a/system/core/Output.php b/system/core/Output.php
index 4d1036ceb..9727a184f 100755
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -106,7 +106,15 @@ class CI_Output {
 		$this->_zlib_oc = @ini_get('zlib.output_compression');
 
 		// Get mime types for later
-		load_environ_config('mimes');
+		if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'))
+		{
+			include APPPATH.'config/'.ENVIRONMENT.'/mimes.php';
+		}
+		else
+		{
+			include APPPATH.'config/mimes.php';
+		}
+
 
 		$this->mime_types = $mimes;