diff options
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_convert.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/utf/utf_tools.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index 08ecd7c5e7..64cb63de3a 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -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)) diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php index a13246c65d..9ab31e60e4 100644 --- a/phpBB/includes/utf/utf_tools.php +++ b/phpBB/includes/utf/utf_tools.php @@ -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; } |