makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 22:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11103] Mark topic/post subscription notification read when approved

Browse source 
PHPBB3-11103
This commit is contained in:
Nathan Guse 2012-12-15 10:33:03 -06:00
parent 418988495b
commit 95bd4d73eb
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
phpBB/includes/mcp/mcp_queue.php
View file

@ -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->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) if ($notify_poster)
{ {
@ -631,6 +637,12 @@ function approve_post($post_id_list, $id, $mode)
'bookmark', 'bookmark',
'post', 'post',
), $post_data); ), $post_data);
$phpbb_notifications->mark_notifications_read(array(
'quote',
'bookmark',
'post',
),$post_data['post_id'], $user->data['user_id']);
if ($notify_poster) if ($notify_poster)
{ {

10
phpBB/includes/notification/manager.php
View file

@ -226,16 +226,6 @@ class phpbb_notification_manager
*/ */
public function mark_notifications_read($item_type, $item_id, $user_id, $time = false) public function mark_notifications_read($item_type, $item_id, $user_id, $time = false)
{ {
if (is_array($item_type))
{
foreach ($item_type as $type)
{
$this->mark_notifications_read($type, $item_id, $user_id, $time);
}
return;
}
$time = ($time !== false) ? $time : time(); $time = ($time !== false) ? $time : time();
$sql = 'UPDATE ' . $this->notifications_table . " $sql = 'UPDATE ' . $this->notifications_table . "