From 249f3c8885d461ae3981dfd7b62093c2175175e3 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 13 Dec 2012 19:19:40 -0600
Subject: [ticket/11103] Instantiate $phpbb_notifications as needed

https://github.com/phpbb/phpbb3/pull/992#discussion_r2413976

PHPBB3-11103
---
 phpBB/includes/mcp/mcp_queue.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes/mcp/mcp_queue.php')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 4a3d443006..2a2146db71 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -33,8 +33,7 @@ class mcp_queue
 	function main($id, $mode)
 	{
 		global $auth, $db, $user, $template, $cache;
-		global $config, $phpbb_root_path, $phpEx, $action;
-		global $phpbb_notifications;
+		global $config, $phpbb_root_path, $phpEx, $action, $phpbb_container;
 
 		include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
 
@@ -79,6 +78,8 @@ class mcp_queue
 				$post_id = request_var('p', 0);
 				$topic_id = request_var('t', 0);
 
+				$phpbb_notifications = $phpbb_container->get('notification_manager');
+
 				if ($topic_id)
 				{
 					$topic_info = get_topic_data(array($topic_id), 'm_approve');
@@ -456,7 +457,7 @@ function approve_post($post_id_list, $id, $mode)
 {
 	global $db, $template, $user, $config;
 	global $phpEx, $phpbb_root_path;
-	global $request, $phpbb_notifications;
+	global $request, $phpbb_container;
 
 	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
 	{
@@ -605,6 +606,8 @@ function approve_post($post_id_list, $id, $mode)
 		// Send out normal user notifications
 		$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
 
+		$phpbb_notifications = $phpbb_container->get('notification_manager');
+
 		// Handle notifications
 		foreach ($post_info as $post_id => $post_data)
 		{
@@ -722,7 +725,7 @@ function disapprove_post($post_id_list, $id, $mode)
 {
 	global $db, $template, $user, $config;
 	global $phpEx, $phpbb_root_path;
-	global $request, $phpbb_notifications;
+	global $request, $phpbb_container;
 
 	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
 	{
@@ -855,6 +858,8 @@ function disapprove_post($post_id_list, $id, $mode)
 			}
 		}
 
+		$phpbb_notifications = $phpbb_container->get('notification_manager');
+
 		foreach ($post_info as $post_id => $post_data)
 		{
 			if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
-- 
cgit v1.2.1