makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10605] Rename $delete_rows to $delete_ids.

Browse source 
PHPBB3-10605
This commit is contained in:
Andreas Fischer 2012-03-27 02:02:17 +02:00
parent ad073d22b9
commit 9c8aab4d32
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
phpBB/includes/functions_privmsgs.php
View file

@ -1105,7 +1105,7 @@ function phpbb_delete_user_pms($user_id)
AND folder_id = ' . PRIVMSGS_NO_BOX . ')';
$result = $db->sql_query($sql);
$undelivered_msg = $undelivered_user = $delete_rows = array();
$undelivered_msg = $undelivered_user = $delete_ids = array();
while ($row = $db->sql_fetchrow($result))
{
if ($row['author_id'] == $user_id && $row['folder_id'] == PRIVMSGS_NO_BOX)
@ -1123,11 +1123,11 @@ function phpbb_delete_user_pms($user_id)
}
}
$delete_rows[(int) $row['msg_id']] = (int) $row['msg_id'];
$delete_ids[(int) $row['msg_id']] = (int) $row['msg_id'];
}
$db->sql_freeresult($result);
if (!sizeof($delete_rows))
if (empty($delete_ids))
{
return false;
}
@ -1154,22 +1154,22 @@ function phpbb_delete_user_pms($user_id)
// Delete private message data
$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . "
WHERE user_id = $user_id
AND " . $db->sql_in_set('msg_id', $delete_rows);
AND " . $db->sql_in_set('msg_id', $delete_ids);
$db->sql_query($sql);
// Now we have to check which messages we can delete completely
$sql = 'SELECT msg_id
FROM ' . PRIVMSGS_TO_TABLE . '
WHERE ' . $db->sql_in_set('msg_id', $delete_rows);
WHERE ' . $db->sql_in_set('msg_id', $delete_ids);
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
unset($delete_rows[$row['msg_id']]);
unset($delete_ids[$row['msg_id']]);
}
$db->sql_freeresult($result);
if (!empty($delete_rows))
if (!empty($delete_ids))
{
// Check if there are any attachments we need to remove
if (!function_exists('delete_attachments'))
@ -1177,10 +1177,10 @@ function phpbb_delete_user_pms($user_id)
include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
}
delete_attachments('message', $delete_rows, false);
delete_attachments('message', $delete_ids, false);
$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
WHERE ' . $db->sql_in_set('msg_id', $delete_rows);
WHERE ' . $db->sql_in_set('msg_id', $delete_ids);
$db->sql_query($sql);
}