summaryrefslogtreecommitdiffstats
path: root/system/helpers/file_helper.php
diff options
context:
space:
mode:
authorEric Barnes <eric@ericlbarnes.com>2011-03-22 02:28:58 +0100
committerEric Barnes <eric@ericlbarnes.com>2011-03-22 02:28:58 +0100
commitfdd5b11b62f127901ddff2e5dc7923b063371070 (patch)
tree62b688d3635918089348a8cca9d4ce03d9ca3711 /system/helpers/file_helper.php
parent74089b2e80614f65112d812470b0959909e37682 (diff)
Fixed logic and removed the error supressing
Diffstat (limited to 'system/helpers/file_helper.php')
-rw-r--r--system/helpers/file_helper.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php
index f4b48b484..7a35c3fa1 100644
--- a/system/helpers/file_helper.php
+++ b/system/helpers/file_helper.php
@@ -352,13 +352,13 @@ if ( ! function_exists('get_mime_by_extension'))
if ( ! is_array($mimes))
{
- if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT))
+ if (is_file(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT))
{
include(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT);
}
- else
+ elseif (is_file(APPPATH.'config/mimes'.EXT))
{
- @include(APPPATH.'config/mimes'.EXT);
+ include(APPPATH.'config/mimes'.EXT);
}
if ( ! is_array($mimes))