From 9d7deba67aa5503314ee829a492e8c82ea09820f Mon Sep 17 00:00:00 2001
From: Pico88 <luki_9@wp.pl>
Date: Sun, 17 Aug 2014 19:02:18 +0200
Subject: [PATCH 1/2] [ticket/12991] Have events after/before "add warning"
 field - user and post

PHPBB3-12991
---
 phpBB/docs/events.md                          | 32 +++++++++++++++++++
 .../prosilver/template/mcp_warn_post.html     |  4 +++
 .../prosilver/template/mcp_warn_user.html     |  4 +++
 .../subsilver2/template/mcp_warn_post.html    |  5 +++
 .../subsilver2/template/mcp_warn_user.html    |  5 +++
 5 files changed, 50 insertions(+)

diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 4f39e71c3c..c235b82e2c 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -434,6 +434,38 @@ memberlist_view_user_statistics_before
 * Since: 3.1.0-a1
 * Purpose: Add entries before the user statistics part of any user profile
 
+mcp_warn_post_add_warning_field_after
+===
+* Locations:
+    + styles/prosilver/template/mcp_warn_post.html
+    + styles/subsilver2/template/mcp_warn_post.html
+* Since: 3.1.0-RC4
+* Purpose: Add content during warning a post - after add warning fields.
+
+mcp_warn_post_add_warning_field_before
+===
+* Locations:
+    + styles/prosilver/template/mcp_warn_post.html
+    + styles/subsilver2/template/mcp_warn_post.html
+* Since: 3.1.0-RC4
+* Purpose: Add content during warning a post - before add warning fields.
+
+mcp_warn_user_add_warning_field_after
+===
+* Locations:
+    + styles/prosilver/template/mcp_warn_user.html
+    + styles/subsilver2/template/mcp_warn_user.html
+* Since: 3.1.0-RC4
+* Purpose: Add content during warning an user - after add warning fields.
+
+mcp_warn_user_add_warning_field_before
+===
+* Locations:
+    + styles/prosilver/template/mcp_warn_user.html
+    + styles/subsilver2/template/mcp_warn_user.html
+* Since: 3.1.0-RC4
+* Purpose: Add content during warning an user - before add warning fields.
+
 navbar_header_logged_out_content
 ===
 * Locations:
diff --git a/phpBB/styles/prosilver/template/mcp_warn_post.html b/phpBB/styles/prosilver/template/mcp_warn_post.html
index 0dd2e14d92..59c7d0d495 100644
--- a/phpBB/styles/prosilver/template/mcp_warn_post.html
+++ b/phpBB/styles/prosilver/template/mcp_warn_post.html
@@ -44,6 +44,8 @@
 	</div>
 </div>
 
+<!-- EVENT mcp_warn_post_add_warning_field_before -->
+
 <div class="panel">
 	<div class="inner">
 
@@ -64,6 +66,8 @@
 	</div>
 </div>
 
+<!-- EVENT mcp_warn_post_add_warning_field_after -->
+
 <fieldset class="submit-buttons">
 	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
 	<input type="submit" name="action[add_warning]" value="{L_SUBMIT}" class="button1" />
diff --git a/phpBB/styles/prosilver/template/mcp_warn_user.html b/phpBB/styles/prosilver/template/mcp_warn_user.html
index 1541f2e5f6..1ad6df7ade 100644
--- a/phpBB/styles/prosilver/template/mcp_warn_user.html
+++ b/phpBB/styles/prosilver/template/mcp_warn_user.html
@@ -28,6 +28,8 @@
 	</div>
 </div>
 
+<!-- EVENT mcp_warn_user_add_warning_field_before -->
+
 <div class="panel">
 	<div class="inner">
 
@@ -48,6 +50,8 @@
 	</div>
 </div>
 
+<!-- EVENT mcp_warn_user_add_warning_field_after -->
+
 <fieldset class="submit-buttons">
 	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
 	<input type="submit" name="action[add_warning]" value="{L_SUBMIT}" class="button1" />
diff --git a/phpBB/styles/subsilver2/template/mcp_warn_post.html b/phpBB/styles/subsilver2/template/mcp_warn_post.html
index 223457d158..68715eff2d 100644
--- a/phpBB/styles/subsilver2/template/mcp_warn_post.html
+++ b/phpBB/styles/subsilver2/template/mcp_warn_post.html
@@ -35,6 +35,8 @@
 
 <form method="post" name="mcp" action="{U_POST_ACTION}">
 
+<!-- EVENT mcp_warn_post_add_warning_field_before -->
+
 <table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
 <tr>
 	<th align="center">{L_ADD_WARNING}</th>
@@ -54,6 +56,9 @@
 	<td class="cat" align="center"><input class="btnmain" type="submit" name="action[add_warning]" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" /></td>
 </tr>
 </table>
+
+<!-- EVENT mcp_warn_post_add_warning_field_after -->
+
 {S_FORM_TOKEN}
 </form>
 
diff --git a/phpBB/styles/subsilver2/template/mcp_warn_user.html b/phpBB/styles/subsilver2/template/mcp_warn_user.html
index 6b78c71557..20b57c6837 100644
--- a/phpBB/styles/subsilver2/template/mcp_warn_user.html
+++ b/phpBB/styles/subsilver2/template/mcp_warn_user.html
@@ -48,6 +48,8 @@
 
 <form method="post" name="mcp" action="{U_POST_ACTION}">
 
+<!-- EVENT mcp_warn_user_add_warning_field_before -->
+
 <table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
 <tr>
 	<th align="center">{L_ADD_WARNING}</th>
@@ -67,6 +69,9 @@
 	<td class="cat" align="center"><input class="btnmain" type="submit" name="action[add_warning]" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" /></td>
 </tr>
 </table>
+
+<!-- EVENT mcp_warn_user_add_warning_field_after -->
+
 {S_FORM_TOKEN}
 </form>
 

From 7fc550aedcf6c2cde1aa6030fca1033093e8216e Mon Sep 17 00:00:00 2001
From: Pico <luki_9@wp.pl>
Date: Sat, 30 Aug 2014 06:31:55 +0200
Subject: [PATCH 2/2] [ticket/12991] Correct language mistakes

PHPBB3-12991
---
 phpBB/docs/events.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index c235b82e2c..681ac3e43a 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -440,7 +440,7 @@ mcp_warn_post_add_warning_field_after
     + styles/prosilver/template/mcp_warn_post.html
     + styles/subsilver2/template/mcp_warn_post.html
 * Since: 3.1.0-RC4
-* Purpose: Add content during warning a post - after add warning fields.
+* Purpose: Add content during warning for a post - after add warning field.
 
 mcp_warn_post_add_warning_field_before
 ===
@@ -448,7 +448,7 @@ mcp_warn_post_add_warning_field_before
     + styles/prosilver/template/mcp_warn_post.html
     + styles/subsilver2/template/mcp_warn_post.html
 * Since: 3.1.0-RC4
-* Purpose: Add content during warning a post - before add warning fields.
+* Purpose: Add content during warning for a post - before add warning field.
 
 mcp_warn_user_add_warning_field_after
 ===
@@ -456,7 +456,7 @@ mcp_warn_user_add_warning_field_after
     + styles/prosilver/template/mcp_warn_user.html
     + styles/subsilver2/template/mcp_warn_user.html
 * Since: 3.1.0-RC4
-* Purpose: Add content during warning an user - after add warning fields.
+* Purpose: Add content during warning a user - after add warning field.
 
 mcp_warn_user_add_warning_field_before
 ===
@@ -464,7 +464,7 @@ mcp_warn_user_add_warning_field_before
     + styles/prosilver/template/mcp_warn_user.html
     + styles/subsilver2/template/mcp_warn_user.html
 * Since: 3.1.0-RC4
-* Purpose: Add content during warning an user - before add warning fields.
+* Purpose: Add content during warning a user - before add warning field.
 
 navbar_header_logged_out_content
 ===