mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'github-nickvergessen/ticket/12370' into develop-ascraeus

Browse Source 
* github-nickvergessen/ticket/12370:
  [ticket/12370] Add unit tests for topic notifications
  [ticket/12370] Fix functional notification test and remove unneeded requests
  [ticket/12370] Do not delete topic notifications when the topic is visible
This commit is contained in:
Nils Adermann
2014-04-10 14:26:41 -07:00
parent 62fad6ae9b c99584ec7b
commit 3f74e5b88b
5 changed files with 295 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/includes/functions_posting.php
View File

@@ -2272,8 +2272,10 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
case 'edit_first_post':
case 'edit':
case 'edit_last_post':
// @todo: Check whether these notification deletions are correct
$phpbb_notifications->delete_notifications('topic', $data['topic_id']);
if ($data['topic_visibility'] != ITEM_APPROVED)
{
$phpbb_notifications->delete_notifications('topic', $data['topic_id']);
}
$phpbb_notifications->delete_notifications(array(
'quote',
@@ -2297,8 +2299,10 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
case 'edit_first_post':
case 'edit':
case 'edit_last_post':
// @todo: Check whether these notification deletions are correct
$phpbb_notifications->delete_notifications('topic', $data['topic_id']);
if ($data['topic_visibility'] != ITEM_APPROVED)
{
$phpbb_notifications->delete_notifications('topic', $data['topic_id']);
}
$phpbb_notifications->delete_notifications(array(
'quote',