diff options
| author | Eric Barnes <eric@ericlbarnes.com> | 2011-03-22 02:28:58 +0100 |
|---|---|---|
| committer | Eric Barnes <eric@ericlbarnes.com> | 2011-03-22 02:28:58 +0100 |
| commit | fdd5b11b62f127901ddff2e5dc7923b063371070 (patch) | |
| tree | 62b688d3635918089348a8cca9d4ce03d9ca3711 /system/libraries | |
| parent | 74089b2e80614f65112d812470b0959909e37682 (diff) | |
Fixed logic and removed the error supressing
Diffstat (limited to 'system/libraries')
| -rw-r--r-- | system/libraries/Upload.php | 17 | ||||
| -rw-r--r-- | system/libraries/User_agent.php | 11 |
2 files changed, 14 insertions, 14 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index e8e47a194..5816a5558 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -951,20 +951,21 @@ class CI_Upload { if (count($this->mimes) == 0) { - if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT)) + if (is_file(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT)) { - $_mimes_path = APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT; + include(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT); } - else + elseif (is_file(APPPATH.'config/mimes'.EXT)) { - $_mimes_path = APPPATH.'config/mimes'.EXT; + include(APPPATH.'config//mimes'.EXT); } - - if (@require($_mimes_path)) + else { - $this->mimes = $mimes; - unset($mimes); + return FALSE; } + + $this->mimes = $mimes; + unset($mimes); } return ( ! isset($this->mimes[$mime])) ? FALSE : $this->mimes[$mime]; diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php index 38cdb40f1..11af21491 100644 --- a/system/libraries/User_agent.php +++ b/system/libraries/User_agent.php @@ -84,16 +84,15 @@ class CI_User_agent { */ private function _load_agent_file() { - if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/user_agents'.EXT)) + if (is_file(APPPATH.'config/'.ENVIRONMENT.'/user_agents'.EXT)) { - $_ua_path = APPPATH.'config/'.ENVIRONMENT.'/user_agents'.EXT; + include(APPPATH.'config/'.ENVIRONMENT.'/user_agents'.EXT); } - else + elseif (is_file(APPPATH.'config/user_agents'.EXT)) { - $_ua_path = APPPATH.'config/user_agents'.EXT; + include(APPPATH.'config/user_agents'.EXT); } - - if ( ! @include($_ua_path)) + else { return FALSE; } |