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/text_helper.php | |
| parent | 74089b2e80614f65112d812470b0959909e37682 (diff) | |
Fixed logic and removed the error supressing
Diffstat (limited to 'system/helpers/text_helper.php')
| -rw-r--r-- | system/helpers/text_helper.php | 13 |
1 files changed, 4 insertions, 9 deletions
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)) |