diff options
| author | bubbafoley <devnull@localhost> | 2011-03-17 20:55:41 +0100 |
|---|---|---|
| committer | bubbafoley <devnull@localhost> | 2011-03-17 20:55:41 +0100 |
| commit | 0ea04149bbae0fdcde92b7362e7cbd76f0df3865 (patch) | |
| tree | 9e7c26f6ccec07636c424003331fbcbc41ea95ff /system/helpers/text_helper.php | |
| parent | ee8a712b10b517a90f03ac858312a82e0fb5d492 (diff) | |
load config files from environment specific locations in core classes, helpers and libraries
Diffstat (limited to 'system/helpers/text_helper.php')
| -rw-r--r-- | system/helpers/text_helper.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php index 96afd4cee..197bcb14e 100644 --- a/system/helpers/text_helper.php +++ b/system/helpers/text_helper.php @@ -366,12 +366,19 @@ if ( ! function_exists('convert_accented_characters')) { function convert_accented_characters($str) { - if ( ! file_exists(APPPATH.'config/foreign_chars'.EXT)) + if ( ! file_exists(APPPATH.'config/foreign_chars'.EXT) AND ! file_exists(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars'.EXT)) { return $str; } - include APPPATH.'config/foreign_chars'.EXT; + if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars'.EXT)) + { + include APPPATH.'config/'.ENVIRONMENT.'/foreign_chars'.EXT; + } + else + { + include APPPATH.'config/foreign_chars'.EXT; + } if ( ! isset($foreign_characters)) { |