Merge branch '3.1.x'

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

phpBB/docs/events.md

@@ -290,6 +290,34 @@ acp_users_prefs_view_prepend
 * Since: 3.1.0-b3
 * Purpose: Add user options fieldset to the top of ACP users view prefs settings
 
+attachment_file_after
+===
+* Locations:
+    + styles/prosilver/template/attachment.html
+* Since: 3.1.6-RC1
+* Purpose: Add content after the attachment.
+
+attachment_file_append
+===
+* Locations:
+    + styles/prosilver/template/attachment.html
+* Since: 3.1.6-RC1
+* Purpose: Add custom attachment types displaying to the bottom of attachment block.
+
+attachment_file_before
+===
+* Locations:
+    + styles/prosilver/template/attachment.html
+* Since: 3.1.6-RC1
+* Purpose: Add content before the attachment.
+
+attachment_file_prepend
+===
+* Locations:
+    + styles/prosilver/template/attachment.html
+* Since: 3.1.6-RC1
+* Purpose: Add custom attachment types displaying to the top of attachment block.
+
 forumlist_body_category_header_after
 ===
 * Locations:

phpBB/styles/prosilver/template/attachment.html

@@ -1,8 +1,10 @@
+<!-- EVENT attachment_file_before -->
 
 <!-- BEGIN _file -->
 	<!-- IF _file.S_DENIED -->
 	<p>[{_file.DENIED_MESSAGE}]</p>
 	<!-- ELSE -->
+		<!-- EVENT attachment_file_prepend -->
 
 		<!-- IF _file.S_THUMBNAIL -->
 		<dl class="thumbnail">
@@ -11,7 +13,6 @@
 		</dl>
 		<!-- ENDIF -->
 
-
 		<!-- IF _file.S_IMAGE -->
 		<dl class="file">
 			<dt class="attach-image"><img src="{_file.U_INLINE_LINK}" class="postimage" alt="{_file.DOWNLOAD_NAME}" onclick="viewableArea(this);" /></dt>
@@ -28,8 +29,6 @@
 		</dl>
 		<!-- ENDIF -->
 
-
-
 		<!-- IF _file.S_WM_FILE -->
 			<!-- method used here from http://alistapart.com/articles/byebyeembed / autosizing seems to not work always, this will not fix -->
 			<object width="320" height="285" classid="CLSID:6BF52A52-394A-11d3-B153-00C04F79FAA6" id="wmstream_{_file.ATTACH_ID}">
@@ -118,5 +117,7 @@
 			<a href="{_file.U_DOWNLOAD_LINK}">{_file.DOWNLOAD_NAME}</a> [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOAD_COUNT} ]</p>
 		<!-- ENDIF -->
 
+		<!-- EVENT attachment_file_append -->
 	<!-- ENDIF -->
 <!-- END _file -->
+<!-- EVENT attachment_file_after -->