mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2020-09-10 12:43:45 +02:00
parent d32bb65cb7 c141962dc8
commit 3d36211101
16 changed files with 710 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
phpBB/includes/functions.php
View File

@@ -580,6 +580,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
'notification.type.post',
'notification.type.approve_topic',
'notification.type.approve_post',
'notification.type.forum',
), false, $user->data['user_id'], $post_time);
if ($config['load_db_lastread'] && $user->data['is_registered'])
@@ -663,6 +664,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
'notification.type.bookmark',
'notification.type.post',
'notification.type.approve_post',
'notification.type.forum',
), $topic_ids, $user->data['user_id'], $post_time);
// Add 0 to forums array to mark global announcements correctly
@@ -773,6 +775,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
'notification.type.bookmark',
'notification.type.post',
'notification.type.approve_post',
'notification.type.forum',
), $topic_id, $user->data['user_id'], $post_time);
if ($config['load_db_lastread'] && $user->data['is_registered'])

2
phpBB/includes/functions_posting.php
View File

@@ -2402,6 +2402,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll_ary, &$data
'notification.type.quote',
'notification.type.bookmark',
'notification.type.post',
'notification.type.forum',
), $notification_data);
break;
@@ -2420,6 +2421,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll_ary, &$data
'notification.type.bookmark',
'notification.type.topic',
'notification.type.post',
'notification.type.forum',
), $notification_data);
break;
}