From 7446361ad4d14bdd4d8074978d51952918fca637 Mon Sep 17 00:00:00 2001
From: marcosbc <marcosbc>
Date: Sat, 15 Mar 2014 21:16:13 +0100
Subject: [PATCH] [ticket/12270] Corrent post and topic approval notification
 message

When you submit a post with needed approval (say user A), and then
it gets approved by another user (user B), a subscribed user (user C)
to that forum would receive a notification indicating:
-A has replied to topic 'New Topic' in the forum 'xyz'.
The expected result would be:
-A has posted a new topic 'New topic' in the forum 'xyz'.
This has fixed by adding a TOPIC_ID template variable to
mcp_post.html and, in there, depending if the first post is the topic's
first post or not, add a input's with name topic_id_list[] or
post_id_list[] and then the respective value (TOPIC_ID or POST_ID).

PHPBB3-12270
---
 phpBB/includes/mcp/mcp_queue.php              |  1 +
 phpBB/styles/prosilver/template/mcp_post.html | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index a71bc997e9..16ec5e14e4 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -316,6 +316,7 @@ 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&amp;mode=approve_details&amp;f=' . $post_info['forum_id'] . '&amp;p=' . $post_id . '&amp;lookup=' . $post_info['poster_ip']) . '#ip' : '',
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html
index 2b4ebec5c8..69e95c46d7 100644
--- a/phpBB/styles/prosilver/template/mcp_post.html
+++ b/phpBB/styles/prosilver/template/mcp_post.html
@@ -75,8 +75,12 @@
 			<p class="post-notice unapproved">
 				<input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" /> &nbsp;
 				<input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" />
-				<!-- IF not S_FIRST_POST --><input type="hidden" name="mode" value="unapproved_posts" /><!-- ENDIF -->
+				<!-- 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>
@@ -86,8 +90,12 @@
 			<p class="post-notice deleted">
 				<input class="button2" type="submit" value="{L_DELETE}" name="action[disapprove]" /> &nbsp;
 				<input class="button1" type="submit" value="{L_RESTORE}" name="action[restore]" />
-				<!-- IF not S_FIRST_POST --><input type="hidden" name="mode" value="unapproved_posts" /><!-- ENDIF -->
+				<!-- 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>