mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 14:00:31 +02:00
[ticket/11103] Make $phpbb_notifications a global and use it everywhere
Do not use phpbb_container everywhere (makes testing difficult) PHPBB3-11103
This commit is contained in:
@@ -451,7 +451,7 @@ function approve_post($post_id_list, $id, $mode)
|
||||
{
|
||||
global $db, $template, $user, $config;
|
||||
global $phpEx, $phpbb_root_path;
|
||||
global $request, $phpbb_container;
|
||||
global $request, $phpbb_notifications;
|
||||
|
||||
if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
|
||||
{
|
||||
@@ -601,7 +601,6 @@ function approve_post($post_id_list, $id, $mode)
|
||||
$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
|
||||
|
||||
// Handle notifications
|
||||
$phpbb_notifications = $phpbb_container->get('notifications');
|
||||
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'])
|
||||
@@ -720,7 +719,7 @@ function disapprove_post($post_id_list, $id, $mode)
|
||||
{
|
||||
global $db, $template, $user, $config;
|
||||
global $phpEx, $phpbb_root_path;
|
||||
global $request, $phpbb_container;
|
||||
global $request, $phpbb_notifications;
|
||||
|
||||
if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
|
||||
{
|
||||
@@ -854,7 +853,6 @@ function disapprove_post($post_id_list, $id, $mode)
|
||||
}
|
||||
|
||||
// Handle notifications (topic/post in queue)
|
||||
$phpbb_notifications = $phpbb_container->get('notifications');
|
||||
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'])
|
||||
|
Reference in New Issue
Block a user