Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12478] Add contact field events to viewtopic_body.html.
  [ticket/12478] Re-add contact field events in ucp_pm_viewmessage.html.

phpBB/docs/events.md

@@ -667,6 +667,22 @@ viewtopic_print_head_append
 * Since: 3.1.0-a1
 * Purpose: Add asset calls directly before the `</head>` tag of the Print Topic screen
 
+viewtopic_body_contact_fields_after
+===
+* Locations:
+    + styles/prosilver/template/viewtopic_body.html
+* Since: 3.1.0-b3
+* Purpose: Add data after the contact fields on the user profile when viewing
+a post
+
+viewtopic_body_contact_fields_before
+===
+* Locations:
+    + styles/prosilver/template/viewtopic_body.html
+* Since: 3.1.0-b3
+* Purpose: Add data before the contact fields on the user profile when viewing
+a post
+
 viewtopic_body_footer_before
 ===
 * Locations:

phpBB/styles/prosilver/template/ucp_pm_viewmessage.html

@@ -33,7 +33,7 @@
 		<!-- END custom_fields -->
 		<!-- EVENT ucp_pm_viewmessage_custom_fields_after -->
 
-
+		<!-- EVENT ucp_pm_viewmessage_contact_fields_before -->
 		<!-- IF .contact -->
 			<dd class="profile-contact">
 				<strong>{L_CONTACT_USER}{L_COLON}</strong>
@@ -59,6 +59,7 @@
 				</div>
 			</dd>
 		<!-- ENDIF -->
+		<!-- EVENT ucp_pm_viewmessage_contact_fields_after -->
 	</dl>
 
 	<div class="postbody">

phpBB/styles/prosilver/template/viewtopic_body.html

@@ -143,6 +143,7 @@
 		<!-- END custom_fields -->
 		<!-- EVENT viewtopic_body_postrow_custom_fields_after -->
 
+		<!-- EVENT viewtopic_body_contact_fields_before -->
 		<!-- IF not S_IS_BOT and .postrow.contact -->
 			<dd class="profile-contact">
 				<strong>{L_CONTACT_USER}{L_COLON}</strong>
@@ -169,6 +170,7 @@
 				</div>
 			</dd>
 		<!-- ENDIF -->
+		<!-- EVENT viewtopic_body_contact_fields_after -->
 
 		</dl>