diff options
| author | bubbafoley <devnull@localhost> | 2011-03-17 20:55:41 +0100 |
|---|---|---|
| committer | bubbafoley <devnull@localhost> | 2011-03-17 20:55:41 +0100 |
| commit | 0ea04149bbae0fdcde92b7362e7cbd76f0df3865 (patch) | |
| tree | 9e7c26f6ccec07636c424003331fbcbc41ea95ff /system/libraries/Upload.php | |
| parent | ee8a712b10b517a90f03ac858312a82e0fb5d492 (diff) | |
load config files from environment specific locations in core classes, helpers and libraries
Diffstat (limited to 'system/libraries/Upload.php')
| -rw-r--r-- | system/libraries/Upload.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 2012fb302..24189f4b4 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -951,7 +951,16 @@ class CI_Upload { if (count($this->mimes) == 0) { - if (@require(APPPATH.'config/mimes'.EXT)) + if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT)) + { + $_mimes_path = APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT; + } + else + { + $_mimes_path = APPPATH.'config/mimes'.EXT; + } + + if (@require($_mimes_path)) { $this->mimes = $mimes; unset($mimes); |