aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-08-31 19:31:13 +0200
committerMarc Alexander <admin@m-a-styles.de>2014-08-31 19:31:13 +0200
commit34d8caf7735b25920cc73dedf0d3e373cbadda4a (patch)
tree038a5acf4fe37a6e386861563dcb1f0c27f33bc3 /phpBB
parent05a7a578159ed325ee4acb29f2b2d4b873b62409 (diff)
parent97c798a375dc5277ce03fccb1682cb0f0cebc976 (diff)
downloadforums-34d8caf7735b25920cc73dedf0d3e373cbadda4a.tar
forums-34d8caf7735b25920cc73dedf0d3e373cbadda4a.tar.gz
forums-34d8caf7735b25920cc73dedf0d3e373cbadda4a.tar.bz2
forums-34d8caf7735b25920cc73dedf0d3e373cbadda4a.tar.xz
forums-34d8caf7735b25920cc73dedf0d3e373cbadda4a.zip
Merge branch 'develop-ascraeus' into develop
Conflicts: phpBB/styles/subsilver2/template/viewtopic_body.html
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/docs/events.md8
-rw-r--r--phpBB/styles/prosilver/template/viewtopic_body.html2
2 files changed, 10 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 584bde6fa6..b6a9b2b4f5 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -1115,6 +1115,14 @@ viewtopic_body_postrow_post_before
* Since: 3.1.0-a4
* Purpose: Add data before posts
+viewtopic_body_postrow_post_content_footer
+===
+* Locations:
+ + styles/prosilver/template/viewtopic_body.html
+ + styles/subsilver2/template/viewtopic_body.html
+* Since: 3.1.0-RC4
+* Purpose: Add data at the end of the posts.
+
viewtopic_body_postrow_post_notices_after
===
* Locations:
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index a51d65ae99..7ed8569798 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -302,6 +302,8 @@
<!-- IF postrow.BUMPED_MESSAGE --><div class="notice"><br /><br />{postrow.BUMPED_MESSAGE}</div><!-- ENDIF -->
<!-- EVENT viewtopic_body_postrow_post_notices_after -->
<!-- IF postrow.SIGNATURE --><div id="sig{postrow.POST_ID}" class="signature">{postrow.SIGNATURE}</div><!-- ENDIF -->
+
+ <!-- EVENT viewtopic_body_postrow_post_content_footer -->
</div>
</div>