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

Merge branch '3.1.x'

Browse source 
Conflicts:
	phpBB/styles/subsilver2/template/viewtopic_body.html
This commit is contained in:
Marc Alexander 2015-02-27 22:10:27 +01:00
commit 5d6f86800f
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/docs/events.md
View file

@ -1301,6 +1301,13 @@ viewtopic_print_head_append
* Since: 3.1.0-a1 * Since: 3.1.0-a1
* Purpose: Add asset calls directly before the `</head>` tag of the Print Topic screen * Purpose: Add asset calls directly before the `</head>` tag of the Print Topic screen
viewtopic_body_pagination_top_after
===
* Locations:
+ styles/prosilver/template/viewtopic_body.html
* Since: 3.1.4-RC1
* Purpose: Add content after the pagination at top
viewtopic_body_avatar_after viewtopic_body_avatar_after
=== ===
* Locations: * Locations:

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

@ -64,7 +64,7 @@
<!-- ENDIF --> <!-- ENDIF -->
</div> </div>
<!-- ENDIF --> <!-- ENDIF -->
<!-- EVENT viewtopic_body_pagination_top_after -->
</div> </div>
<!-- IF S_HAS_POLL --> <!-- IF S_HAS_POLL -->