aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/message_parser.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-10-07 12:36:31 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-10-07 12:36:31 +0000
commitf8528a659c919d7bc1e78c5aacc95e27cddec627 (patch)
treebb70865f922867a83fa144f315ad40014a982e2b /phpBB/includes/message_parser.php
parente87f740a9e7a048b7900d92ede04f405a337441c (diff)
downloadforums-f8528a659c919d7bc1e78c5aacc95e27cddec627.tar
forums-f8528a659c919d7bc1e78c5aacc95e27cddec627.tar.gz
forums-f8528a659c919d7bc1e78c5aacc95e27cddec627.tar.bz2
forums-f8528a659c919d7bc1e78c5aacc95e27cddec627.tar.xz
forums-f8528a659c919d7bc1e78c5aacc95e27cddec627.zip
tried to begin adjusting all string functions where applicable - still a *lot* to do.
i hope i catched all relevant sections and did not mess something up. git-svn-id: file:///svn/phpbb/trunk@6452 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/message_parser.php')
-rw-r--r--phpBB/includes/message_parser.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index cad82aaf8c..b5005d8ceb 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -445,7 +445,7 @@ class bbcode_firstpass extends bbcode
$code = preg_replace('#(?:[\n\r\s\t]|&nbsp;)*</span>$#', '</span>', $code);
// remove newline at the end
- if (!empty($code) && $code{strlen($code)-1} == "\n")
+ if (!empty($code) && $code{utf8_strlen($code)-1} == "\n")
{
$code = substr($code, 0, -1);
}
@@ -597,7 +597,7 @@ class bbcode_firstpass extends bbcode
do
{
$pos = strlen($in);
- for ($i = 0; $i < strlen($tok); ++$i)
+ for ($i = 0, $tok_len = strlen($tok); $i < $tok_len; ++$i)
{
$tmp_pos = strpos($in, $tok{$i});
if ($tmp_pos !== false && $tmp_pos < $pos)
@@ -912,7 +912,7 @@ class parse_message extends bbcode_firstpass
// Message length check. -1 disables this check completely.
if ($config['max_' . $mode . '_chars'] != -1)
{
- $msg_len = ($mode == 'post') ? strlen($this->message) : strlen(preg_replace('#\[\/?[a-z\*\+\-]+(=[\S]+)?\]#is', ' ', $this->message));
+ $msg_len = ($mode == 'post') ? utf8_strlen($this->message) : utf8_strlen(preg_replace('#\[\/?[a-z\*\+\-]+(=[\S]+)?\]#is', ' ', $this->message));
if ((!$msg_len && $mode !== 'sig') || $config['max_' . $mode . '_chars'] && $msg_len > $config['max_' . $mode . '_chars'])
{