Direct return from mimes config, instead of using global $mimes;
Global variables are generally a terrible idea, especially for something as simple as this. The mimes.php now returns an array instead of just injecting a variable name into the global namespace.
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index bd97a61..e31029e 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -930,18 +930,16 @@
{
if (defined('ENVIRONMENT') && is_file(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'))
{
- include(APPPATH.'config/'.ENVIRONMENT.'/mimes.php');
+ $this->mimes = include(APPPATH.'config/'.ENVIRONMENT.'/mimes.php');
}
elseif (is_file(APPPATH.'config/mimes.php'))
{
- include(APPPATH.'config/mimes.php');
+ $this->mimes = include(APPPATH.'config/mimes.php');
}
else
{
return FALSE;
}
-
- $this->mimes = $mimes;
}
return isset($this->mimes[$mime]) ? $this->mimes[$mime] : FALSE;