diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 4a8fc98fc0..aa8fee3cb4 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -206,7 +206,8 @@ p a {
[Fix] Give more feedback in icon/smilie management (Bug #13295)
[Fix] Correctly set user::lang_id (Bug #14010)
[Fix] Properly display the smiley export screen (Bug #13968)
- [Fix] Add "DECIMAL:", "PDECIMAL", and "PDECIMAL:" to the schema creation code (Bug #13999) - patch provided by poyntesm
+ [Feature] Add "DECIMAL:", "PDECIMAL", and "PDECIMAL:" to the schema creation code (Bug #13999) - patch provided by poyntesm
+ [Fix] Don't show the notify checkbox in the approval queue if the only posts are written by ANONYMOUS (Bug #13973)
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 06cabf65a0..f82a99c2c3 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -460,12 +460,12 @@ function approve_post($post_id_list, $id, $mode)
'redirect' => $redirect)
);
+ $post_info = get_post_data($post_id_list, 'm_approve');
+
if (confirm_box(true))
{
$notify_poster = (isset($_REQUEST['notify_poster'])) ? true : false;
- $post_info = get_post_data($post_id_list, 'm_approve');
-
// If Topic -> total_topics = total_topics+1, total_posts = total_posts+1, forum_topics = forum_topics+1, forum_posts = forum_posts+1
// If Post -> total_posts = total_posts+1, forum_posts = forum_posts+1, topic_replies = topic_replies+1
@@ -690,8 +690,23 @@ function approve_post($post_id_list, $id, $mode)
}
else
{
+ $show_notify = false;
+
+ foreach ($post_info as $post_data)
+ {
+ if ($post_data['poster_id'] == ANONYMOUS)
+ {
+ continue;
+ }
+ else
+ {
+ $show_notify = true;
+ break;
+ }
+ }
+
$template->assign_vars(array(
- 'S_NOTIFY_POSTER' => true,
+ 'S_NOTIFY_POSTER' => $show_notify,
'S_APPROVE' => true)
);
@@ -771,9 +786,10 @@ function disapprove_post($post_id_list, $id, $mode)
}
}
+ $post_info = get_post_data($post_id_list, 'm_approve');
+
if (confirm_box(true))
{
- $post_info = get_post_data($post_id_list, 'm_approve');
// If Topic -> forum_topics_real -= 1
// If Post -> topic_replies_real -= 1
@@ -929,8 +945,23 @@ function disapprove_post($post_id_list, $id, $mode)
display_reasons($reason_id);
+ $show_notify = false;
+
+ foreach ($post_info as $post_data)
+ {
+ if ($post_data['poster_id'] == ANONYMOUS)
+ {
+ continue;
+ }
+ else
+ {
+ $show_notify = true;
+ break;
+ }
+ }
+
$template->assign_vars(array(
- 'S_NOTIFY_POSTER' => true,
+ 'S_NOTIFY_POSTER' => $show_notify,
'S_APPROVE' => false,
'REASON' => $reason,
'ADDITIONAL_MSG' => $additional_msg)