Merge branch 'develop-ascraeus' into develop

Conflicts:
	phpBB/styles/subsilver2/template/mcp_warn_post.html
	phpBB/styles/subsilver2/template/mcp_warn_user.html

phpBB/docs/events.md

@@ -406,6 +406,34 @@ 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
+* Since: 3.1.0-RC4
+* Purpose: Add content during warning for a post - after add warning field.
+
+mcp_warn_post_add_warning_field_before
+===
+* Locations:
+    + styles/prosilver/template/mcp_warn_post.html
+* Since: 3.1.0-RC4
+* Purpose: Add content during warning for a post - before add warning field.
+
+mcp_warn_user_add_warning_field_after
+===
+* Locations:
+    + styles/prosilver/template/mcp_warn_user.html
+* Since: 3.1.0-RC4
+* Purpose: Add content during warning a user - after add warning field.
+
+mcp_warn_user_add_warning_field_before
+===
+* Locations:
+    + styles/prosilver/template/mcp_warn_user.html
+* Since: 3.1.0-RC4
+* Purpose: Add content during warning a user - before add warning field.
+
 navbar_header_logged_out_content
 ===
 * Locations:

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" />

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" />