aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-06-23 10:30:09 +0200
committerAndreas Fischer <bantu@phpbb.com>2012-06-23 10:30:09 +0200
commit2a76b7e8690eaf19c25ed4c13540c1e1aab31cdd (patch)
tree041f981d7c79b14744aabdc23e63d1ed3a552d00 /phpBB/includes
parent35b18676cda35b81277a9532ac9a579abbfda09d (diff)
downloadforums-2a76b7e8690eaf19c25ed4c13540c1e1aab31cdd.tar
forums-2a76b7e8690eaf19c25ed4c13540c1e1aab31cdd.tar.gz
forums-2a76b7e8690eaf19c25ed4c13540c1e1aab31cdd.tar.bz2
forums-2a76b7e8690eaf19c25ed4c13540c1e1aab31cdd.tar.xz
forums-2a76b7e8690eaf19c25ed4c13540c1e1aab31cdd.zip
[ticket/10950] Remove redundant if statement.
We already know author_id and folder_id. PHPBB3-10950
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions_privmsgs.php21
1 files changed, 9 insertions, 12 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index d76efd2ff6..d75b4d92a8 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1140,19 +1140,16 @@ function phpbb_delete_user_pms($user_id)
while ($row = $db->sql_fetchrow($result))
{
- if ($row['author_id'] == $user_id && $row['folder_id'] == PRIVMSGS_NO_BOX)
- {
- // Undelivered messages
- $undelivered_msg[] = $row['msg_id'];
+ // Undelivered messages
+ $undelivered_msg[] = $row['msg_id'];
- if (isset($undelivered_user[$row['user_id']]))
- {
- ++$undelivered_user[$row['user_id']];
- }
- else
- {
- $undelivered_user[$row['user_id']] = 1;
- }
+ if (isset($undelivered_user[$row['user_id']]))
+ {
+ ++$undelivered_user[$row['user_id']];
+ }
+ else
+ {
+ $undelivered_user[$row['user_id']] = 1;
}
$delete_ids[(int) $row['msg_id']] = (int) $row['msg_id'];