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:
Joas Schilling 2015-02-02 23:07:33 +01:00
commit 7f8a726702
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
phpBB/docs/events.md
View file

@ -1387,6 +1387,20 @@ viewtopic_body_postrow_post_content_footer
* Since: 3.1.0-RC4 * Since: 3.1.0-RC4
* Purpose: Add data at the end of the posts. * Purpose: Add data at the end of the posts.
viewtopic_body_postrow_post_details_after
===
* Locations:
+ styles/prosilver/template/viewtopic_body.html
* Since: 3.1.4-RC1
* Purpose: Add content after the post details
viewtopic_body_postrow_post_details_before
===
* Locations:
+ styles/prosilver/template/viewtopic_body.html
* Since: 3.1.4-RC1
* Purpose: Add content before the post details
viewtopic_body_postrow_post_notices_after viewtopic_body_postrow_post_notices_after
=== ===
* Locations: * Locations:

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

@ -249,7 +249,9 @@
<!-- ENDIF --> <!-- ENDIF -->
<!-- ENDIF --> <!-- ENDIF -->
<!-- EVENT viewtopic_body_postrow_post_details_before -->
<p class="author"><!-- IF S_IS_BOT -->{postrow.MINI_POST_IMG}<!-- ELSE --><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><!-- ENDIF --><span class="responsive-hide">{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong> &raquo; </span>{postrow.POST_DATE} </p> <p class="author"><!-- IF S_IS_BOT -->{postrow.MINI_POST_IMG}<!-- ELSE --><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><!-- ENDIF --><span class="responsive-hide">{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong> &raquo; </span>{postrow.POST_DATE} </p>
<!-- EVENT viewtopic_body_postrow_post_details_after -->
<!-- IF postrow.S_POST_UNAPPROVED --> <!-- IF postrow.S_POST_UNAPPROVED -->
<form method="post" class="mcp_approve" action="{postrow.U_APPROVE_ACTION}"> <form method="post" class="mcp_approve" action="{postrow.U_APPROVE_ACTION}">