diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-11-10 11:20:06 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-11-10 11:20:06 -0600 |
| commit | 106daa09ebb5b12bf9892c41f8c1de627cf6b0e9 (patch) | |
| tree | 792cbe612c13a0f412558fd7b0a0793535527790 /phpBB/includes/functions_privmsgs.php | |
| parent | 68363e362d4b6d3fe717a8ffae95ab13eb374e9f (diff) | |
| download | forums-106daa09ebb5b12bf9892c41f8c1de627cf6b0e9.tar forums-106daa09ebb5b12bf9892c41f8c1de627cf6b0e9.tar.gz forums-106daa09ebb5b12bf9892c41f8c1de627cf6b0e9.tar.bz2 forums-106daa09ebb5b12bf9892c41f8c1de627cf6b0e9.tar.xz forums-106daa09ebb5b12bf9892c41f8c1de627cf6b0e9.zip | |
[ticket/11103] Fix failed automerge
PHPBB3-11103
Diffstat (limited to 'phpBB/includes/functions_privmsgs.php')
| -rw-r--r-- | phpBB/includes/functions_privmsgs.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 7acc37eb85..54e8ced679 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -1142,7 +1142,6 @@ function delete_pm($user_id, $msg_ids, $folder_id) function phpbb_delete_user_pms($user_id) { global $db, $user, $phpbb_root_path, $phpEx; - global $phpbb_notifications; $user_id = (int) $user_id; @@ -1164,6 +1163,7 @@ function phpbb_delete_user_pms($user_id) function phpbb_delete_users_pms($user_ids) { global $db, $user, $phpbb_root_path, $phpEx; + global $phpbb_notifications; $user_id_sql = $db->sql_in_set('user_id', $user_ids); $author_id_sql = $db->sql_in_set('author_id', $user_ids); |