diff options
author | David M <davidmj@users.sourceforge.net> | 2007-03-27 23:22:04 +0000 |
---|---|---|
committer | David M <davidmj@users.sourceforge.net> | 2007-03-27 23:22:04 +0000 |
commit | c9e6302172102ec7eba7cdc439b63009491238df (patch) | |
tree | adcff4740fec110428a4a004ea1d6645d1a78e80 | |
parent | bf94e3b1324da9ca582d6a14b20928f487fc5713 (diff) | |
download | forums-c9e6302172102ec7eba7cdc439b63009491238df.tar forums-c9e6302172102ec7eba7cdc439b63009491238df.tar.gz forums-c9e6302172102ec7eba7cdc439b63009491238df.tar.bz2 forums-c9e6302172102ec7eba7cdc439b63009491238df.tar.xz forums-c9e6302172102ec7eba7cdc439b63009491238df.zip |
#5330
git-svn-id: file:///svn/phpbb/trunk@7235 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r-- | phpBB/includes/utf/utf_tools.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php index 4c5b4a8983..7a97857538 100644 --- a/phpBB/includes/utf/utf_tools.php +++ b/phpBB/includes/utf/utf_tools.php @@ -642,7 +642,7 @@ function utf8_str_split($str, $split_len = 1) /** * UTF-8 aware alternative to strcspn -* Find length of initial segment not matching mask +* Find length of initial segment matching the mask * * @author Harry Fuecks */ @@ -739,6 +739,7 @@ function utf8_recode($string, $encoding) case 'iso-8859-15': case 'windows-1251': case 'windows-1252': + case 'cp1252': case 'shift_jis': case 'euc-kr': case 'big5': |