Merge branch 'develop-ascraeus' into develop

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

phpBB/docs/events.md

@@ -701,6 +701,20 @@ posting_editor_subject_before
 * Since: 3.1.0-a2
 * Purpose: Add field (e.g. textbox) to the posting screen before the subject
 
+posting_pm_header_find_username_after
+===
+* Locations:
+    + styles/prosilver/template/posting_pm_header.html
+* Since: 3.1.0-RC4
+* Purpose: Add content after the find username link on composing pm
+
+posting_pm_header_find_username_before
+===
+* Locations:
+    + styles/prosilver/template/posting_pm_header.html
+* Since: 3.1.0-RC4
+* Purpose: Add content before the find username link on composing pm
+
 quickreply_editor_panel_after
 ===
 * Locations:

phpBB/styles/prosilver/template/posting_pm_header.html

@@ -15,7 +15,9 @@
 				<dd class="recipients">
 				<input type="submit" name="add_to" value="{L_ADD}" class="button2" tabindex="1" />
 				<input type="submit" name="add_bcc" value="{L_ADD_BCC}" class="button2" tabindex="1" />
+				<!-- EVENT posting_pm_header_find_username_before -->
 				<span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></span>
+				<!-- EVENT posting_pm_header_find_username_after -->
 				</dd>
 			</dl>
 			<!-- ENDIF -->