aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/utf/utf_tools.php
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2006-11-03 23:09:16 +0000
committerDavid M <davidmj@users.sourceforge.net>2006-11-03 23:09:16 +0000
commit8b0ec6e02d5a53ea3d1b87abd122d39cc3e8366f (patch)
tree22bae5ecbab9dbf8390ab3763f53c15c822c9198 /phpBB/includes/utf/utf_tools.php
parent7ab232a45504ef357a19d9ab58dd27c454e12784 (diff)
downloadforums-8b0ec6e02d5a53ea3d1b87abd122d39cc3e8366f.tar
forums-8b0ec6e02d5a53ea3d1b87abd122d39cc3e8366f.tar.gz
forums-8b0ec6e02d5a53ea3d1b87abd122d39cc3e8366f.tar.bz2
forums-8b0ec6e02d5a53ea3d1b87abd122d39cc3e8366f.tar.xz
forums-8b0ec6e02d5a53ea3d1b87abd122d39cc3e8366f.zip
- compress is nicer (fixed a bug :P)
- UTF-8 code is nicer (fixed a bug :P) - new CAPTCHA. Replaced the old one for size and usability issues. The old CAPTCHA will most likely be released as a separate package git-svn-id: file:///svn/phpbb/trunk@6549 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/utf/utf_tools.php')
-rw-r--r--phpBB/includes/utf/utf_tools.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php
index aa29159d5e..7a2b536e97 100644
--- a/phpBB/includes/utf/utf_tools.php
+++ b/phpBB/includes/utf/utf_tools.php
@@ -781,7 +781,7 @@ function utf8_recode($string, $encoding)
*/
function utf8_encode_ncr($text)
{
- return preg_replace_callback('#[\\xC2-\\xF4][\\x80-\\xBF]?[\\x80-\\xBF]?[\\x80-\\xBF]+#', 'utf8_encode_ncr_callback', $text);
+ return preg_replace_callback('#[\\xC2-\\xF4][\\x80-\\xBF]{1,3}#', 'utf8_encode_ncr_callback', $text);
}
/**
@@ -824,7 +824,7 @@ function utf8_ord($chr)
break;
default:
- return $m;
+ return $chr;
}
}