diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-06-01 23:10:43 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-06-01 23:10:43 +0000 |
| commit | eee331875f5982acf77002716f73aa1e2c116fbb (patch) | |
| tree | 3079399e45a680b487be47686f0d2460e8ad7676 | |
| parent | 81d996f55f922bff143f638be71f86ffff3a35f0 (diff) | |
| download | forums-eee331875f5982acf77002716f73aa1e2c116fbb.tar forums-eee331875f5982acf77002716f73aa1e2c116fbb.tar.gz forums-eee331875f5982acf77002716f73aa1e2c116fbb.tar.bz2 forums-eee331875f5982acf77002716f73aa1e2c116fbb.tar.xz forums-eee331875f5982acf77002716f73aa1e2c116fbb.zip | |
#12039
git-svn-id: file:///svn/phpbb/trunk@7703 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 2 | ||||
| -rw-r--r-- | phpBB/includes/utf/data/recode_basic.php | 39 | ||||
| -rw-r--r-- | phpBB/includes/utf/utf_tools.php | 1 |
3 files changed, 41 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 7b9705bd8c..bc1fd6ea16 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -202,7 +202,7 @@ p a { <li>[Fix] Check global purge setting (Bug #11555)</li> <li>[Fix] Improper magic url parsing applied to already parsed [url=] bbcode tag (Bug #11429)</li> <li>[Fix] Renamed two indicies for Oracle support (Bug #11457)</li> - <li>[Fix] Added support for ISO-8859-8-i in the character set convertor (Bug #11265)</li> + <li>[Fix] Added support for ISO-8859-8(-i) in the character set convertor (Bug #11265, #12039)</li> <li>[Fix] Added support for Oracle's "easy connect naming"</li> <li>[Fix] Let Mark/Unmark All work in Manage Drafts (Bug #11679)</li> <li>[Fix] Display correct message if no attachments found in user administration (Bug #11629)</li> diff --git a/phpBB/includes/utf/data/recode_basic.php b/phpBB/includes/utf/data/recode_basic.php index 03391c9376..c44fca09d9 100644 --- a/phpBB/includes/utf/data/recode_basic.php +++ b/phpBB/includes/utf/data/recode_basic.php @@ -406,6 +406,45 @@ function iso_8859_7($string) return strtr($string, $transform); } +function iso_8859_8($string) +{ + static $tranform = array( + "\xC2\xAA" => "\xC3\x97", + "\xC2\xBA" => "\xC3\xB7", + "\xC3\x9F" => "\xE2\x80\x97", + "\xC3\xA0" => "\xD7\x90", + "\xC3\xA1" => "\xD7\x91", + "\xC3\xA2" => "\xD7\x92", + "\xC3\xA3" => "\xD7\x93", + "\xC3\xA4" => "\xD7\x94", + "\xC3\xA5" => "\xD7\x95", + "\xC3\xA6" => "\xD7\x96", + "\xC3\xA7" => "\xD7\x97", + "\xC3\xA8" => "\xD7\x98", + "\xC3\xA9" => "\xD7\x99", + "\xC3\xAA" => "\xD7\x9A", + "\xC3\xAB" => "\xD7\x9B", + "\xC3\xAC" => "\xD7\x9C", + "\xC3\xAD" => "\xD7\x9D", + "\xC3\xAE" => "\xD7\x9E", + "\xC3\xAF" => "\xD7\x9F", + "\xC3\xB0" => "\xD7\xA0", + "\xC3\xB1" => "\xD7\xA1", + "\xC3\xB2" => "\xD7\xA2", + "\xC3\xB3" => "\xD7\xA3", + "\xC3\xB4" => "\xD7\xA4", + "\xC3\xB5" => "\xD7\xA5", + "\xC3\xB6" => "\xD7\xA6", + "\xC3\xB7" => "\xD7\xA7", + "\xC3\xB8" => "\xD7\xA8", + "\xC3\xB9" => "\xD7\xA9", + "\xC3\xBA" => "\xD7\xAA", + "\xC3\xBD" => "\xE2\x80\x8E", + "\xC3\xBE" => "\xE2\x80\x8F", + ); + return strtr(utf8_encode($string), $transform); +} + function iso_8859_9($string) { static $tranform = array( diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php index b2107c2f83..99fe3d9427 100644 --- a/phpBB/includes/utf/utf_tools.php +++ b/phpBB/includes/utf/utf_tools.php @@ -788,6 +788,7 @@ function utf8_recode($string, $encoding) case '2': case '4': case '7': + case '8': case '9': case '15': if (!function_exists('iso_8859_' . $array[1])) |