Merge branch '3.1.x'

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

phpBB/docs/events.md

@@ -1428,6 +1428,13 @@ quickreply_editor_subject_before
 * Since: 3.1.7-RC1
 * Purpose: Add content before the quick reply subject textbox
 
+search_body_form_after
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the search form
+
 search_body_form_before
 ===
 * Locations:
@@ -1435,6 +1442,90 @@ search_body_form_before
 * Since: 3.1.5-RC1
 * Purpose: Add content before the search form
 
+search_body_recent_search_after
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the recent search queries list
+
+search_body_recent_search_before
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the recent search queries list
+
+search_body_search_display_options_append
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Put content at the bottom of the search query display options fields set
+
+search_body_search_display_options_prepend
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Put content at the top of the search query display options fields set
+
+search_body_search_options_after
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the search query options fields set
+
+search_body_search_options_append
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Put content at the bottom of the search query options fields set
+
+search_body_search_options_before
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the search query options fields set
+
+search_body_search_options_prepend
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Put content at the top of the search query options fields set
+
+search_body_search_query_after
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the search query fields set
+
+search_body_search_query_append
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Put content at the bottom of the search query fields set
+
+search_body_search_query_before
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the search query fields set
+
+search_body_search_query_prepend
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Put content at the top of the search query fields set
+
 search_results_header_after
 ===
 * Locations:

phpBB/styles/prosilver/template/search_body.html

@@ -9,7 +9,9 @@
 	<div class="inner">
 	<h3>{L_SEARCH_QUERY}</h3>
 
+	<!-- EVENT search_body_search_query_before -->
 	<fieldset>
+	<!-- EVENT search_body_search_query_prepend -->
 	<dl>
 		<dt><label for="keywords">{L_SEARCH_KEYWORDS}{L_COLON}</label><br /><span>{L_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
 		<dd><input type="search" class="inputbox" name="keywords" id="keywords" size="40" title="{L_SEARCH_KEYWORDS}" /></dd>
@@ -20,7 +22,9 @@
 		<dt><label for="author">{L_SEARCH_AUTHOR}{L_COLON}</label><br /><span>{L_SEARCH_AUTHOR_EXPLAIN}</span></dt>
 		<dd><input type="search" class="inputbox" name="author" id="author" size="40" title="{L_SEARCH_AUTHOR}" /></dd>
 	</dl>
+	<!-- EVENT search_body_search_query_append -->
 	</fieldset>
+	<!-- EVENT search_body_search_query_after -->
 
 	</div>
 </div>
@@ -30,7 +34,9 @@
 
 	<h3>{L_SEARCH_OPTIONS}</h3>
 
+	<!-- EVENT search_body_search_options_before -->
 	<fieldset>
+	<!-- EVENT search_body_search_options_prepend -->
 	<dl>
 		<dt><label for="search_forum">{L_SEARCH_FORUMS}{L_COLON}</label><br /><span>{L_SEARCH_FORUMS_EXPLAIN}</span></dt>
 		<dd><select name="fid[]" id="search_forum" multiple="multiple" size="8" title="{L_SEARCH_FORUMS}">{S_FORUM_OPTIONS}</select></dd>
@@ -49,9 +55,11 @@
 		<dd><label for="sf3"><input type="radio" name="sf" id="sf3" value="titleonly" /> {L_SEARCH_TITLE_ONLY}</label></dd>
 		<dd><label for="sf4"><input type="radio" name="sf" id="sf4" value="firstpost" /> {L_SEARCH_FIRST_POST}</label></dd>
 	</dl>
+	<!-- EVENT search_body_search_options_append -->
 
 	<hr class="dashed" />
 
+	<!-- EVENT search_body_search_display_options_prepend -->
 	<dl>
 		<dt><label for="show_results1">{L_DISPLAY_RESULTS}{L_COLON}</label></dt>
 		<dd>
@@ -74,7 +82,9 @@
 		<dt><label>{L_RETURN_FIRST}{L_COLON}</label></dt>
 		<dd><select name="ch" title="{L_RETURN_FIRST}">{S_CHARACTER_OPTIONS}</select> {L_POST_CHARACTERS}</dd>
 	</dl>
+	<!-- EVENT search_body_search_display_options_append -->
 	</fieldset>
+	<!-- EVENT search_body_search_options_after -->
 
 	</div>
 </div>
@@ -91,7 +101,9 @@
 </div>
 
 </form>
+<!-- EVENT search_body_form_after -->
 
+<!-- EVENT search_body_recent_search_before -->
 <!-- IF .recentsearch -->
 <div class="forumbg forumbg-table">
 	<div class="inner">
@@ -119,5 +131,6 @@
 	</div>
 </div>
 <!-- ENDIF -->
+<!-- EVENT search_body_recent_search_after -->
 
 <!-- INCLUDE overall_footer.html -->