summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Upload.php15
-rw-r--r--system/libraries/User_agent.php13
2 files changed, 19 insertions, 9 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;
}
diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php
index 5288525cb..c31ff2646 100644
--- a/system/libraries/User_agent.php
+++ b/system/libraries/User_agent.php
@@ -94,10 +94,15 @@ class CI_User_agent {
*/
protected function _load_agent_file()
{
- load_environ_config('user_agents');
-
- // 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.'/user_agents.php'))
+ {
+ include(APPPATH.'config/'.ENVIRONMENT.'/user_agents.php');
+ }
+ elseif (is_file(APPPATH.'config/user_agents.php'))
+ {
+ include(APPPATH.'config/user_agents.php');
+ }
+ else
{
return FALSE;
}