From 106daa09ebb5b12bf9892c41f8c1de627cf6b0e9 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 10 Nov 2012 11:20:06 -0600
Subject: [PATCH] [ticket/11103] Fix failed automerge

PHPBB3-11103
---
 phpBB/includes/functions_privmsgs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);