mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source 
Conflicts:
	phpBB/styles/subsilver2/template/search_results.html
This commit is contained in:
Joas Schilling
2015-02-20 20:42:52 +01:00
parent 0dab7e2552 461ce3f892
commit 61fa9dcb9f
2 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
phpBB/docs/events.md
View File

@@ -896,6 +896,20 @@ quickreply_editor_message_before
* Since: 3.1.0-a4
* Purpose: Add content before the quick reply textbox
search_results_header_after
===
* Locations:
+ styles/prosilver/template/search_results.html
* Since: 3.1.4-RC1
* Purpose: Add content after the header of the search results
search_results_header_before
===
* Locations:
+ styles/prosilver/template/search_results.html
* Since: 3.1.4-RC1
* Purpose: Add content before the header of the search results.
search_results_post_after
===
* Locations:
@@ -924,6 +938,13 @@ search_results_postprofile_before
* Since: 3.1.0-b3
* Purpose: Add content directly before the post author in search results (posts view mode)
search_results_searchbox_after
===
* Locations:
+ styles/prosilver/template/search_results.html
* Since: 3.1.4-RC1
* Purpose: Add content right after the searchbox of the search results.
search_results_topic_after
===
* Locations: