diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-10-04 14:47:13 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-10-04 14:47:13 -0500 |
| commit | b9bc65eed88bbd2dff12102909903cbf4dc9b368 (patch) | |
| tree | f8ede0fe1a0d295fd764c34f56990fe08378e0bc /phpBB/includes/mcp/mcp_queue.php | |
| parent | 07fb66ac1090dfe92431ed749b520115595f7927 (diff) | |
| download | forums-b9bc65eed88bbd2dff12102909903cbf4dc9b368.tar forums-b9bc65eed88bbd2dff12102909903cbf4dc9b368.tar.gz forums-b9bc65eed88bbd2dff12102909903cbf4dc9b368.tar.bz2 forums-b9bc65eed88bbd2dff12102909903cbf4dc9b368.tar.xz forums-b9bc65eed88bbd2dff12102909903cbf4dc9b368.zip | |
[ticket/11103] Make $phpbb_notifications a global and use it everywhere
Do not use phpbb_container everywhere (makes testing difficult)
PHPBB3-11103
Diffstat (limited to 'phpBB/includes/mcp/mcp_queue.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_queue.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index 1d2caa38d5..77e778fc38 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -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']) |