diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-12-26 18:59:30 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-12-26 18:59:30 +0100 |
| commit | 358ffec0a6b2a1fcc55e09623619126671d3e65f (patch) | |
| tree | 6888d3f0a73500575db564cb4e5dbe5b828e4589 /system/libraries/Upload.php | |
| parent | d9f0a1496af1dfca7c317028708b2cd1e5727cea (diff) | |
| parent | 5c1aa631c5f5ec2f6b75ba1158178418e50ba11a (diff) | |
Merge pull request #826 from EllisLab/feature/abstract-config-load
Abstracting the loading of files in the config directory depending on environments
Diffstat (limited to 'system/libraries/Upload.php')
| -rw-r--r-- | system/libraries/Upload.php | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 826bcceb8..5108afa1b 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -952,17 +952,12 @@ class CI_Upload { { global $mimes; - if (count($this->mimes) == 0) + if (count($this->mimes) === 0) { - 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'); - } - else + load_environ_config('mimes'); + + // Return FALSE if we still have no mimes after trying to load them up. + if (count($this->mimes) === 0) { return FALSE; } |