makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
Conflicts:
	phpBB/styles/subsilver2/template/viewtopic_body.html
This commit is contained in:
Marc Alexander 2014-08-31 19:31:13 +02:00
commit 34d8caf773
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/docs/events.md
View file

@ -1115,6 +1115,14 @@ viewtopic_body_postrow_post_before
* Since: 3.1.0-a4 * Since: 3.1.0-a4
* Purpose: Add data before posts * 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 viewtopic_body_postrow_post_notices_after
=== ===
* Locations: * Locations:

2
phpBB/styles/prosilver/template/viewtopic_body.html
View file

@ -302,6 +302,8 @@
<!-- IF postrow.BUMPED_MESSAGE --><div class="notice"><br /><br />{postrow.BUMPED_MESSAGE}</div><!-- ENDIF --> <!-- IF postrow.BUMPED_MESSAGE --><div class="notice"><br /><br />{postrow.BUMPED_MESSAGE}</div><!-- ENDIF -->
<!-- EVENT viewtopic_body_postrow_post_notices_after --> <!-- EVENT viewtopic_body_postrow_post_notices_after -->
<!-- IF postrow.SIGNATURE --><div id="sig{postrow.POST_ID}" class="signature">{postrow.SIGNATURE}</div><!-- ENDIF --> <!-- IF postrow.SIGNATURE --><div id="sig{postrow.POST_ID}" class="signature">{postrow.SIGNATURE}</div><!-- ENDIF -->
<!-- EVENT viewtopic_body_postrow_post_content_footer -->
</div> </div>
</div> </div>