diff options
| author | Florian Pritz <bluewind@server-speed.net> | 2011-04-10 10:39:31 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@server-speed.net> | 2011-04-10 10:39:31 +0200 |
| commit | 1bdc9c8903eb2db33fdb8174d61e15100dfbbca8 (patch) | |
| tree | b0c645ad99e04f34817fc4e6385792111db42274 /system/helpers/text_helper.php | |
| parent | 413d0cdac49257089a0790f6ac92973a36a6b69f (diff) | |
update to CI 2.0.2
Signed-off-by: Florian Pritz <bluewind@server-speed.net>
Diffstat (limited to 'system/helpers/text_helper.php')
| -rwxr-xr-x | system/helpers/text_helper.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php index 47e6ccc93..cca093976 100755 --- a/system/helpers/text_helper.php +++ b/system/helpers/text_helper.php @@ -366,12 +366,14 @@ if ( ! function_exists('convert_accented_characters')) { function convert_accented_characters($str) { - if ( ! file_exists(APPPATH.'config/foreign_chars'.EXT)) + if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars'.EXT)) { - return $str; + include(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars'.EXT); + } + elseif (is_file(APPPATH.'config/foreign_chars'.EXT)) + { + include(APPPATH.'config/foreign_chars'.EXT); } - - include APPPATH.'config/foreign_chars'.EXT; if ( ! isset($foreign_characters)) { @@ -443,7 +445,7 @@ if ( ! function_exists('word_wrap')) } $temp = ''; - while((strlen($line)) > $charlim) + while ((strlen($line)) > $charlim) { // If the over-length word is a URL we won't wrap it if (preg_match("!\[url.+\]|://|wwww.!", $line)) |