diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-12-15 18:25:51 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-12-15 18:25:51 -0600 |
| commit | c9ca7051491143e3c0da43663e85b60e18c6740e (patch) | |
| tree | ec10169c1d5737f2e48eac0f6997fd6e55716049 /phpBB/includes/mcp/mcp_queue.php | |
| parent | d0375c46f91eb88508cbd8e320c7eda78d4f01dd (diff) | |
| parent | 95bd4d73eb41d677470b0bf77c521ae2a9bb731e (diff) | |
| download | forums-c9ca7051491143e3c0da43663e85b60e18c6740e.tar forums-c9ca7051491143e3c0da43663e85b60e18c6740e.tar.gz forums-c9ca7051491143e3c0da43663e85b60e18c6740e.tar.bz2 forums-c9ca7051491143e3c0da43663e85b60e18c6740e.tar.xz forums-c9ca7051491143e3c0da43663e85b60e18c6740e.zip | |
Merge branch 'ticket/11103' of github.com:EXreaction/phpbb3 into ticket/11103
Diffstat (limited to 'phpBB/includes/mcp/mcp_queue.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_queue.php | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index 2a2146db71..24afa1f210 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -615,7 +615,13 @@ function approve_post($post_id_list, $id, $mode) { $phpbb_notifications->delete_notifications('topic_in_queue', $post_data['topic_id']); - $phpbb_notifications->add_notifications('topic', $post_data); + $phpbb_notifications->add_notifications(array( + 'quote', + 'topic', + ), $post_data); + + $phpbb_notifications->mark_notifications_read('quote', $post_data['post_id'], $user->data['user_id']); + $phpbb_notifications->mark_notifications_read('topic', $post_data['topic_id'], $user->data['user_id']); if ($notify_poster) { @@ -631,6 +637,12 @@ function approve_post($post_id_list, $id, $mode) 'bookmark', 'post', ), $post_data); + + $phpbb_notifications->mark_notifications_read(array( + 'quote', + 'bookmark', + 'post', + ),$post_data['post_id'], $user->data['user_id']); if ($notify_poster) { |