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/helpers | |
| parent | 74089b2e80614f65112d812470b0959909e37682 (diff) | |
Fixed logic and removed the error supressing
Diffstat (limited to 'system/helpers')
| -rw-r--r-- | system/helpers/download_helper.php | 6 | ||||
| -rw-r--r-- | system/helpers/file_helper.php | 6 | ||||
| -rw-r--r-- | system/helpers/html_helper.php | 6 | ||||
| -rw-r--r-- | system/helpers/text_helper.php | 13 |
4 files changed, 13 insertions, 18 deletions
diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php index 56e4c2a2f..e537cdeca 100644 --- a/system/helpers/download_helper.php +++ b/system/helpers/download_helper.php @@ -58,13 +58,13 @@ if ( ! function_exists('force_download')) $extension = end($x); // Load the mime types - 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); } // Set a default mime if we can't find it 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)) diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php index 15c15a919..53fc899a3 100644 --- a/system/helpers/html_helper.php +++ b/system/helpers/html_helper.php @@ -258,13 +258,13 @@ if ( ! function_exists('doctype')) if ( ! is_array($_doctypes)) { - if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/doctypes'.EXT)) + if (is_file(APPPATH.'config/'.ENVIRONMENT.'/doctypes'.EXT)) { include(APPPATH.'config/'.ENVIRONMENT.'/doctypes'.EXT); } - else + elseif (is_file(APPPATH.'config/doctypes'.EXT)) { - @include(APPPATH.'config/doctypes'.EXT); + include(APPPATH.'config/doctypes'.EXT); } if ( ! is_array($_doctypes)) diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php index 99f521fb5..664408912 100644 --- a/system/helpers/text_helper.php +++ b/system/helpers/text_helper.php @@ -366,18 +366,13 @@ if ( ! function_exists('convert_accented_characters')) { function convert_accented_characters($str) { - if ( ! file_exists(APPPATH.'config/foreign_chars'.EXT) AND ! file_exists(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars'.EXT)) + if (is_file(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars'.EXT)) { - return $str; + include(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars'.EXT); } - - if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars'.EXT)) - { - include APPPATH.'config/'.ENVIRONMENT.'/foreign_chars'.EXT; - } - else + elseif (is_file(APPPATH.'config/foreign_chars'.EXT)) { - include APPPATH.'config/foreign_chars'.EXT; + include(APPPATH.'config/foreign_chars'.EXT); } if ( ! isset($foreign_characters)) |