aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-03-27 01:29:29 +0200
committerAndreas Fischer <bantu@phpbb.com>2012-03-27 01:29:29 +0200
commit2203bc204e55c33e2e9b212eeb0c7bf2e3060851 (patch)
tree317329ff6e39802a0ae1a040578fbb581cad6b12 /phpBB
parente8830f605f73a0c8fa5c3ea579ee18f295b81600 (diff)
downloadforums-2203bc204e55c33e2e9b212eeb0c7bf2e3060851.tar
forums-2203bc204e55c33e2e9b212eeb0c7bf2e3060851.tar.gz
forums-2203bc204e55c33e2e9b212eeb0c7bf2e3060851.tar.bz2
forums-2203bc204e55c33e2e9b212eeb0c7bf2e3060851.tar.xz
forums-2203bc204e55c33e2e9b212eeb0c7bf2e3060851.zip
[ticket/10605] Turn $undelivered_user into a real array of counters.
PHPBB3-10605
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/functions_privmsgs.php16
1 files changed, 12 insertions, 4 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 59dea50094..352bd4d15d 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1113,7 +1113,15 @@ function phpbb_delete_user_pms($user_id)
{
// Undelivered messages
$undelivered_msg[] = $row['msg_id'];
- $undelivered_user[$row['user_id']][] = true;
+
+ if (isset($undelivered_user[$row['user_id']]))
+ {
+ ++$undelivered_user[$row['user_id']];
+ }
+ else
+ {
+ $undelivered_user[$row['user_id']] = 1;
+ }
}
$delete_rows[$row['msg_id']] = true;
@@ -1135,11 +1143,11 @@ function phpbb_delete_user_pms($user_id)
}
unset($undelivered_user[$user_id]);
- foreach ($undelivered_user as $_user_id => $ary)
+ foreach ($undelivered_user as $_user_id => $count)
{
$sql = 'UPDATE ' . USERS_TABLE . '
- SET user_new_privmsg = user_new_privmsg - ' . sizeof($ary) . ',
- user_unread_privmsg = user_unread_privmsg - ' . sizeof($ary) . '
+ SET user_new_privmsg = user_new_privmsg - ' . $count . ',
+ user_unread_privmsg = user_unread_privmsg - ' . $count . '
WHERE user_id = ' . $_user_id;
$db->sql_query($sql);
}