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

[ticket/11103] Fix failed automerge

Browse Source 
PHPBB3-11103
This commit is contained in:
Nathaniel Guse
2012-11-10 11:20:06 -06:00
parent 68363e362d
commit 106daa09eb
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/functions_privmsgs.php
View File

@@ -1142,7 +1142,6 @@ function delete_pm($user_id, $msg_ids, $folder_id)
function phpbb_delete_user_pms($user_id) function phpbb_delete_user_pms($user_id)
{ {
global $db, $user, $phpbb_root_path, $phpEx; global $db, $user, $phpbb_root_path, $phpEx;
global $phpbb_notifications;
$user_id = (int) $user_id; $user_id = (int) $user_id;
@@ -1164,6 +1163,7 @@ function phpbb_delete_user_pms($user_id)
function phpbb_delete_users_pms($user_ids) function phpbb_delete_users_pms($user_ids)
{ {
global $db, $user, $phpbb_root_path, $phpEx; global $db, $user, $phpbb_root_path, $phpEx;
global $phpbb_notifications;
$user_id_sql = $db->sql_in_set('user_id', $user_ids); $user_id_sql = $db->sql_in_set('user_id', $user_ids);
$author_id_sql = $db->sql_in_set('author_id', $user_ids); $author_id_sql = $db->sql_in_set('author_id', $user_ids);