mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/11103] Instantiate $phpbb_notifications as needed

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

PHPBB3-11103
This commit is contained in:
Nathan Guse
2012-12-13 19:19:40 -06:00
parent 84284a9cce
commit 249f3c8885
12 changed files with 69 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
phpBB/includes/mcp/mcp_queue.php
View File

@@ -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'])