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

[ticket/11963] Don't depend on user_notify flag to delete report notifications.

Browse source 
PHPBB3-11963
This commit is contained in:
Cesar G 2013-11-23 10:16:08 -08:00
parent 0d0b2627f7
commit a6a23784c3
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/includes/mcp/mcp_reports.php
View file

@ -615,23 +615,25 @@ function close_report($report_id_list, $mode, $action, $pm = false)
} }
unset($close_report_posts, $close_report_topics); unset($close_report_posts, $close_report_topics);
$phpbb_notifications = $phpbb_container->get('notification_manager');
foreach ($reports as $report) foreach ($reports as $report)
{ {
if ($pm) if ($pm)
{ {
add_log('mod', 0, 0, 'LOG_PM_REPORT_' . strtoupper($action) . 'D', $post_info[$report['pm_id']]['message_subject']); add_log('mod', 0, 0, 'LOG_PM_REPORT_' . strtoupper($action) . 'D', $post_info[$report['pm_id']]['message_subject']);
$phpbb_notifications->delete_notifications('report_pm', $report['pm_id']);
} }
else else
{ {
add_log('mod', $post_info[$report['post_id']]['forum_id'], $post_info[$report['post_id']]['topic_id'], 'LOG_REPORT_' . strtoupper($action) . 'D', $post_info[$report['post_id']]['post_subject']); add_log('mod', $post_info[$report['post_id']]['forum_id'], $post_info[$report['post_id']]['topic_id'], 'LOG_REPORT_' . strtoupper($action) . 'D', $post_info[$report['post_id']]['post_subject']);
$phpbb_notifications->delete_notifications('report_post', $report['post_id']);
} }
} }
// Notify reporters // Notify reporters
if (sizeof($notify_reporters)) if (sizeof($notify_reporters))
{ {
$phpbb_notifications = $phpbb_container->get('notification_manager');
foreach ($notify_reporters as $report_id => $reporter) foreach ($notify_reporters as $report_id => $reporter)
{ {
if ($reporter['user_id'] == ANONYMOUS) if ($reporter['user_id'] == ANONYMOUS)
@ -648,8 +650,6 @@ function close_report($report_id_list, $mode, $action, $pm = false)
'closer_id' => $user->data['user_id'], 'closer_id' => $user->data['user_id'],
'from_user_id' => $post_info[$post_id]['author_id'], 'from_user_id' => $post_info[$post_id]['author_id'],
))); )));
$phpbb_notifications->delete_notifications('report_pm', $post_id);
} }
else else
{ {
@ -657,8 +657,6 @@ function close_report($report_id_list, $mode, $action, $pm = false)
'reporter' => $reporter['user_id'], 'reporter' => $reporter['user_id'],
'closer_id' => $user->data['user_id'], 'closer_id' => $user->data['user_id'],
))); )));
$phpbb_notifications->delete_notifications('report_post', $post_id);
} }
} }
} }