1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

Merge branch '3.1.x'

* 3.1.x:
  [ticket/13808] search_body_form_before

Conflicts:
	phpBB/styles/subsilver2/template/search_body.html
This commit is contained in:
Joas Schilling 2015-05-28 11:09:24 +02:00
commit c5b2822cf5
2 changed files with 8 additions and 0 deletions

View File

@ -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:

View File

@ -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">