summaryrefslogtreecommitdiffstats
path: root/system/helpers/file_helper.php
diff options
context:
space:
mode:
authorbubbafoley <devnull@localhost>2011-03-17 20:55:41 +0100
committerbubbafoley <devnull@localhost>2011-03-17 20:55:41 +0100
commit0ea04149bbae0fdcde92b7362e7cbd76f0df3865 (patch)
tree9e7c26f6ccec07636c424003331fbcbc41ea95ff /system/helpers/file_helper.php
parentee8a712b10b517a90f03ac858312a82e0fb5d492 (diff)
load config files from environment specific locations in core classes, helpers and libraries
Diffstat (limited to 'system/helpers/file_helper.php')
-rw-r--r--system/helpers/file_helper.php11
1 files changed, 10 insertions, 1 deletions
diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php
index 9518e4843..fb074e027 100644
--- a/system/helpers/file_helper.php
+++ b/system/helpers/file_helper.php
@@ -352,7 +352,16 @@ if ( ! function_exists('get_mime_by_extension'))
if ( ! is_array($mimes))
{
- if ( ! require_once(APPPATH.'config/mimes.php'))
+ if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT))
+ {
+ @include(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT);
+ }
+ else
+ {
+ @include(APPPATH.'config/mimes'.EXT);
+ }
+
+ if ( ! is_array($mimes))
{
return FALSE;
}