summaryrefslogtreecommitdiffstats
path: root/system/libraries/Upload.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/libraries/Upload.php
parentd459cbb96d9c9703ef6c62756240b7c612835e5c (diff)
Revert "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.php15
1 files changed, 10 insertions, 5 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 5108afa1b..826bcceb8 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -952,12 +952,17 @@ class CI_Upload {
{
global $mimes;
- if (count($this->mimes) === 0)
+ if (count($this->mimes) == 0)
{
- load_environ_config('mimes');
-
- // Return FALSE if we still have no mimes after trying to load them up.
- 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
{
return FALSE;
}