diff options
| -rwxr-xr-x[-rw-r--r--] | phpBB/includes/mcp/mcp_queue.php | 11 | ||||
| -rwxr-xr-x[-rw-r--r--] | phpBB/styles/prosilver/template/mcp_post.html | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index 16ec5e14e4..e003f28c30 100644..100755 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -316,7 +316,6 @@ class mcp_queue 'POST_IP' => $post_info['poster_ip'], 'POST_IPADDR' => ($auth->acl_get('m_info', $post_info['forum_id']) && request_var('lookup', '')) ? @gethostbyaddr($post_info['poster_ip']) : '', 'POST_ID' => $post_info['post_id'], - 'TOPIC_ID' => $post_info['topic_id'], 'S_FIRST_POST' => ($post_info['topic_first_post_id'] == $post_id), 'U_LOOKUP_IP' => ($auth->acl_get('m_info', $post_info['forum_id'])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=approve_details&f=' . $post_info['forum_id'] . '&p=' . $post_id . '&lookup=' . $post_info['poster_ip']) . '#ip' : '', @@ -579,6 +578,7 @@ class mcp_queue $redirect = reapply_sid($redirect); $success_msg = $post_url = ''; $approve_log = array(); + $topic_approve_log = array(); $s_hidden_fields = build_hidden_fields(array( 'i' => $id, @@ -687,7 +687,14 @@ class mcp_queue continue; } - $phpbb_notifications->add_notifications('approve_post', $post_data); + if ($topic_info[$post_data['topic_id']]['first_post']) + { + $phpbb_notifications->add_notifications('approve_topic', $topic_info[$post_data['topic_id']]); + } + else + { + $phpbb_notifications->add_notifications('approve_post', $post_data); + } } } } diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html index 69e95c46d7..f2feccf25d 100644..100755 --- a/phpBB/styles/prosilver/template/mcp_post.html +++ b/phpBB/styles/prosilver/template/mcp_post.html @@ -75,12 +75,8 @@ <p class="post-notice unapproved"> <input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" /> <input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" /> - <!-- IF not S_FIRST_POST --> <input type="hidden" name="mode" value="unapproved_posts" /> <input type="hidden" name="post_id_list[]" value="{POST_ID}" /> - <!-- ELSE --> - <input type="hidden" name="topic_id_list[]" value="{TOPIC_ID}" /> - <!-- ENDIF --> {S_FORM_TOKEN} </p> </form> |