diff options
author | Daniel Hunsaker <danhunsaker@gmail.com> | 2013-03-04 10:04:25 +0100 |
---|---|---|
committer | Daniel Hunsaker <danhunsaker@gmail.com> | 2013-03-04 10:04:25 +0100 |
commit | e5d7af508680afced4c96b5a52a054c73b6c537e (patch) | |
tree | 133b6f7791b975bfc6ecb017ba3a8d862cdecb6c /system/helpers | |
parent | 3b5b7f48848d098c6190781f8790a1b0dcb0217c (diff) | |
parent | 5780d8b2078126f8eb5738658fceadd38c66fe5b (diff) |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into feature/exit-status
Diffstat (limited to 'system/helpers')
-rw-r--r-- | system/helpers/text_helper.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php index 54db14f94..b2351db95 100644 --- a/system/helpers/text_helper.php +++ b/system/helpers/text_helper.php @@ -363,9 +363,9 @@ if ( ! function_exists('convert_accented_characters')) */ function convert_accented_characters($str) { - static $_foreign_characters; + static $array_from, $array_to; - if ( ! is_array($_foreign_characters)) + if ( ! is_array($array_from)) { if (file_exists(APPPATH.'config/foreign_chars.php')) { @@ -379,14 +379,17 @@ if ( ! function_exists('convert_accented_characters')) if (empty($foreign_characters) OR ! is_array($foreign_characters)) { - $_foreign_characters = array(); + $array_from = array(); + $array_to = array(); + return $str; } - $_foreign_characters = $foreign_characters; + $array_from = array_keys($foreign_characters); + $array_to = array_values($foreign_characters); } - return preg_replace(array_keys($_foreign_characters), array_values($_foreign_characters), $str); + return preg_replace($array_from, $array_to, $str); } } |