diff options
| author | Joas Schilling <nickvergessen@owncloud.com> | 2015-05-28 11:09:24 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@owncloud.com> | 2015-05-28 11:09:24 +0200 |
| commit | c5b2822cf50188cb65f973fb4c2d1315f47d25b2 (patch) | |
| tree | 8a7fd27062bb48b09ab5d58b1a4b90dcc099f736 /phpBB | |
| parent | 95b3b4605a073edde70027c4ad4c889cec89c7a8 (diff) | |
| parent | 8fda16527e75ae46dfa6e4dc580bf58e1162b2ea (diff) | |
| download | forums-c5b2822cf50188cb65f973fb4c2d1315f47d25b2.tar forums-c5b2822cf50188cb65f973fb4c2d1315f47d25b2.tar.gz forums-c5b2822cf50188cb65f973fb4c2d1315f47d25b2.tar.bz2 forums-c5b2822cf50188cb65f973fb4c2d1315f47d25b2.tar.xz forums-c5b2822cf50188cb65f973fb4c2d1315f47d25b2.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/13808] search_body_form_before
Conflicts:
phpBB/styles/subsilver2/template/search_body.html
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/events.md | 7 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/search_body.html | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index b7b5e7de61..893ed26f59 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -987,6 +987,13 @@ quickreply_editor_message_before * Since: 3.1.0-a4 * Purpose: Add content before the quick reply textbox +search_body_form_before +=== +* Locations: + + styles/prosilver/template/search_body.htm +* Since: 3.1.5 +* Purpose: Add content before the search form + search_results_header_after === * Locations: diff --git a/phpBB/styles/prosilver/template/search_body.html b/phpBB/styles/prosilver/template/search_body.html index 2f15830eb1..8d56a103d2 100644 --- a/phpBB/styles/prosilver/template/search_body.html +++ b/phpBB/styles/prosilver/template/search_body.html @@ -2,6 +2,7 @@ <h2 class="solo">{L_SEARCH}</h2> +<!-- EVENT search_body_form_before --> <form method="get" action="{S_SEARCH_ACTION}" data-focus="keywords"> <div class="panel"> |