aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_queue.php
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2013-11-23 11:03:37 -0800
committerCesar G <prototech91@gmail.com>2013-11-23 11:03:37 -0800
commit8fa8037b4e98f0e0ea0076280e14ddf1aa6d6ee7 (patch)
treee675609b3d465f1be2bf8feace864a20365eed71 /phpBB/includes/mcp/mcp_queue.php
parenta6a23784c37862100d69c49244ee68097e6277d0 (diff)
downloadforums-8fa8037b4e98f0e0ea0076280e14ddf1aa6d6ee7.tar
forums-8fa8037b4e98f0e0ea0076280e14ddf1aa6d6ee7.tar.gz
forums-8fa8037b4e98f0e0ea0076280e14ddf1aa6d6ee7.tar.bz2
forums-8fa8037b4e98f0e0ea0076280e14ddf1aa6d6ee7.tar.xz
forums-8fa8037b4e98f0e0ea0076280e14ddf1aa6d6ee7.zip
[ticket/11963] Delete topic_in_queue notifications in MCP approve_details mode
PHPBB3-11963
Diffstat (limited to 'phpBB/includes/mcp/mcp_queue.php')
-rw-r--r--phpBB/includes/mcp/mcp_queue.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index db461d07fa..e5cc1a941b 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -652,6 +652,11 @@ class mcp_queue
// Handle notifications
foreach ($post_info as $post_id => $post_data)
{
+ // A single topic approval may also happen here, so handle deleting the respective notification.
+ if (!$post_data['topic_posts_approved'])
+ {
+ $phpbb_notifications->delete_notifications('topic_in_queue', $post_data['topic_id']);
+ }
$phpbb_notifications->delete_notifications('post_in_queue', $post_id);
$phpbb_notifications->add_notifications(array(