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

[ticket/12270] Fixed rebase conflicts

Browse Source 
PHPBB3-12270
This commit is contained in:
marcosbc 2014-05-03 21:05:29 +02:00
parent 46c658bdbf
commit deba1329c8
1 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
phpBB/includes/mcp/mcp_queue.php
View File

@ -653,34 +653,27 @@ class mcp_queue
// Handle notifications
foreach ($post_info as $post_id => $post_data)
{
// A single topic approval may also happen here.
// A single topic approval may also happen here, so handle deleting the respective notification.
if (!$post_data['topic_posts_approved'])
{
$phpbb_notifications->delete_notifications('topic_in_queue', $post_data['topic_id']);
$topic_id_list[] = $post_data['topic_id'];
}
<<<<<<< HEAD
$phpbb_notifications->delete_notifications('post_in_queue', $post_id);
<<<<<<< HEAD
// Only add notifications, if we are not reapproving post
// When the topic was already approved, but was edited and
// now needs re-approval, we don't want to notify the users
// again.
if ($post_data['post_visibility'] == ITEM_UNAPPROVED)
=======
// Send post notification only if a topic notification will not be sent.
if (!$send_topic_notification)
>>>>>>> c3f1f31... [ticket/12270] Correct notifications for posts/topics now working
=======
// Send post notification only if a topic notification will not be sent.
else
>>>>>>> a21cc11... [ticket/12270] Better structured code and no debug error message
{
$phpbb_notifications->add_notifications(array(
'quote',
'bookmark',
'post',
), $post_data);
// Only add notifications, if we are not reapproving post
// When the topic was already approved, but was edited and
// now needs re-approval, we don't want to notify the users
// again.
if ($post_data['post_visibility'] == ITEM_UNAPPROVED)
{
$phpbb_notifications->add_notifications(array(
'quote',
'bookmark',
'post',
), $post_data);
}
}
$phpbb_notifications->delete_notifications('post_in_queue', $post_id);