Merge branch 'develop-ascraeus' into develop

Conflicts:
	phpBB/styles/subsilver2/template/memberlist_search.html

phpBB/docs/events.md

@@ -392,6 +392,27 @@ memberlist_body_username_prepend
 * Purpose: Add information before every username in the memberlist. Works in
 all display modes (leader, group and normal memberlist).
 
+memberlist_search_fields_after
+===
+* Locations:
+    + styles/prosilver/template/memberlist_search.html
+* Since: 3.1.2-RC1
+* Purpose: Add information after the search fields column.
+
+memberlist_search_fields_before
+===
+* Locations:
+    + styles/prosilver/template/memberlist_search.html
+* Since: 3.1.2-RC1
+* Purpose: Add information before the search fields column.
+
+memberlist_search_sorting_options_before
+===
+* Locations:
+    + styles/prosilver/template/memberlist_search.html
+* Since: 3.1.2-RC1
+* Purpose: Add information before the search sorting options field.
+
 memberlist_view_contact_after
 ===
 * Locations:

phpBB/styles/prosilver/template/memberlist_search.html

@@ -6,6 +6,7 @@
 
 	<p>{L_FIND_USERNAME_EXPLAIN}</p>
 
+	<!-- EVENT memberlist_search_fields_before -->
 	<fieldset class="fields1 column1">
 	<dl style="overflow: visible;">
 		<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>
@@ -39,6 +40,7 @@
 		<dt><label for="search_group_id">{L_GROUP}{L_COLON}</label></dt>
 		<dd><select name="search_group_id" id="search_group_id">{S_GROUP_SELECT}</select></dd>
 	</dl>
+	<!-- EVENT memberlist_search_sorting_options_before -->
 	<dl>
 		<dt><label for="sk" class="label3">{L_SORT_BY}{L_COLON}</label></dt>
 		<dd><select name="sk" id="sk">{S_SORT_OPTIONS}</select> <select name="sd">{S_ORDER_SELECT}</select></dd>
@@ -66,6 +68,7 @@
 		<dd><input class="inputbox medium" type="text" name="ip" id="ip" value="{IP}" /></dd>
 	</dl>
 <!-- ENDIF -->
+	<!-- EVENT memberlist_search_fields_after -->
 	</fieldset>
 
 	<div class="clear"></div>