summaryrefslogtreecommitdiffstats
path: root/system/core/Output.php
diff options
context:
space:
mode:
authorGreg Aker <greg@gregaker.net>2011-12-25 08:24:29 +0100
committerGreg Aker <greg@gregaker.net>2011-12-25 08:24:29 +0100
commit5c1aa631c5f5ec2f6b75ba1158178418e50ba11a (patch)
tree3dc36050275f67bbb7ba52f92d62609b12291369 /system/core/Output.php
parent11ce5da8c743b5f6592c83a2b91e545d76a8789b (diff)
Abstracting the loading of files in the config directory depending on environments.
Diffstat (limited to 'system/core/Output.php')
-rwxr-xr-xsystem/core/Output.php10
1 files changed, 1 insertions, 9 deletions
diff --git a/system/core/Output.php b/system/core/Output.php
index 9727a184f..4d1036ceb 100755
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -106,15 +106,7 @@ class CI_Output {
$this->_zlib_oc = @ini_get('zlib.output_compression');
// Get mime types for later
- if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'))
- {
- include APPPATH.'config/'.ENVIRONMENT.'/mimes.php';
- }
- else
- {
- include APPPATH.'config/mimes.php';
- }
-
+ load_environ_config('mimes');
$this->mime_types = $mimes;