aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_posting.php
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2012-10-04 14:47:13 -0500
committerNathan Guse <nathaniel.guse@gmail.com>2012-10-04 14:47:13 -0500
commitb9bc65eed88bbd2dff12102909903cbf4dc9b368 (patch)
treef8ede0fe1a0d295fd764c34f56990fe08378e0bc /phpBB/includes/functions_posting.php
parent07fb66ac1090dfe92431ed749b520115595f7927 (diff)
downloadforums-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/functions_posting.php')
-rw-r--r--phpBB/includes/functions_posting.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 6262cee4ad..3658757e5e 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1409,7 +1409,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data)
function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $update_message = true, $update_search_index = true)
{
global $db, $auth, $user, $config, $phpEx, $template, $phpbb_root_path;
- global $phpbb_container;
+ global $phpbb_notifications;
// We do not handle erasing posts here
if ($mode == 'delete')
@@ -2220,7 +2220,6 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
}
// Send Notifications
- $phpbb_notifications = $phpbb_container->get('notifications');
$notification_data = array_merge($data, array(
'topic_title' => (isset($data['topic_title'])) ? $data['topic_title'] : $subject,
'post_username' => $username,
@@ -2229,6 +2228,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
'post_time' => $current_time,
'post_subject' => $subject,
));
+
if ($post_approval)
{
switch ($mode)