mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00
Code Issues Releases Wiki Activity

#7698

Browse Source 
- small UTF-8 thing


git-svn-id: file:///svn/phpbb/trunk@6971 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M
2007-02-07 04:02:00 +00:00
parent 333b3515ed
commit 0fc55efc7d
4 changed files with 96 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/functions_convert.php
View File

@@ -1205,7 +1205,7 @@ function update_folder_pm_count()
$sql = 'SELECT user_id, folder_id, COUNT(msg_id) as num_messages
FROM ' . PRIVMSGS_TO_TABLE . '
WHERE folder_id NOT IN (' . PRIVMSGS_NO_BOX . ', ' . PRIVMSGS_HOLD_BOX . ', ' . PRIVMSGS_INBOX . ', ' . PRIVMSGS_OUTBOX . ', ' . PRIVMSGS_SENTBOX . ')
GROUP BY folder_id';
GROUP BY folder_id, user_id';
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))

6
phpBB/includes/utf/utf_tools.php
View File

@@ -719,7 +719,7 @@ function utf8_recode($string, $encoding)
{
$ret = @iconv($encoding, 'utf-8', $string);
if (isset($ret[0]))
if (!empty($ret))
{
return $ret;
}
@@ -730,7 +730,7 @@ function utf8_recode($string, $encoding)
{
$ret = @mb_convert_encoding($string, 'utf-8', $encoding);
if (isset($ret[0]))
if (!empty($ret))
{
return $ret;
}
@@ -741,7 +741,7 @@ function utf8_recode($string, $encoding)
{
$ret = @recode_string($encoding . '..utf-8', $string);
if (isset($ret[0]))
if (!empty($ret))
{
return $ret;
}