diff options
| author | marcosbc <marcosbc> | 2014-05-03 21:05:29 +0200 |
|---|---|---|
| committer | marcosbc <marcosbc> | 2014-05-03 21:05:29 +0200 |
| commit | deba1329c893507a33a146bac8140f44d6e07e66 (patch) | |
| tree | 3465b1215703eebbd15c0ba83f3e2067677f02de /phpBB/includes/mcp/mcp_queue.php | |
| parent | 46c658bdbf87826b003640da26b613320e91e9ec (diff) | |
| download | forums-deba1329c893507a33a146bac8140f44d6e07e66.tar forums-deba1329c893507a33a146bac8140f44d6e07e66.tar.gz forums-deba1329c893507a33a146bac8140f44d6e07e66.tar.bz2 forums-deba1329c893507a33a146bac8140f44d6e07e66.tar.xz forums-deba1329c893507a33a146bac8140f44d6e07e66.zip | |
[ticket/12270] Fixed rebase conflicts
PHPBB3-12270
Diffstat (limited to 'phpBB/includes/mcp/mcp_queue.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_queue.php | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index a3e6e62b07..c2bcb048b3 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -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); |