summaryrefslogtreecommitdiffstats
path: root/system/helpers/file_helper.php
diff options
context:
space:
mode:
authorGreg Aker <greg@gregaker.net>2011-12-27 23:23:47 +0100
committerGreg Aker <greg@gregaker.net>2011-12-27 23:23:47 +0100
commitd96f88277c1e9a4c069c2e2ee3d779385549f31a (patch)
tree5d3f9fb534ca9fa17635ddcd8c3d38abe51deec2 /system/helpers/file_helper.php
parentd459cbb96d9c9703ef6c62756240b7c612835e5c (diff)
Revert "Abstracting the loading of files in the config directory depending on environments."
Diffstat (limited to 'system/helpers/file_helper.php')
-rw-r--r--system/helpers/file_helper.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php
index b4edcdea4..5b5085381 100644
--- a/system/helpers/file_helper.php
+++ b/system/helpers/file_helper.php
@@ -364,7 +364,14 @@ if ( ! function_exists('get_mime_by_extension'))
if ( ! is_array($mimes))
{
- load_environ_config('mimes');
+ if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'))
+ {
+ include(APPPATH.'config/'.ENVIRONMENT.'/mimes.php');
+ }
+ elseif (is_file(APPPATH.'config/mimes.php'))
+ {
+ include(APPPATH.'config/mimes.php');
+ }
if ( ! is_array($mimes))
{