diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-10-24 18:21:17 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-10-24 18:21:17 +0200 |
| commit | 52b1a9d4fa877bc6633ec53c905bd4dfaddbbf8d (patch) | |
| tree | 667383a952212f314a343aa18248fda3079234cd | |
| parent | 2a038d45df982611811741211dd9ba953a4a9c5a (diff) | |
| parent | cac8ac8242d37fe4e7e2baad8583f40b1d747c45 (diff) | |
| download | forums-52b1a9d4fa877bc6633ec53c905bd4dfaddbbf8d.tar forums-52b1a9d4fa877bc6633ec53c905bd4dfaddbbf8d.tar.gz forums-52b1a9d4fa877bc6633ec53c905bd4dfaddbbf8d.tar.bz2 forums-52b1a9d4fa877bc6633ec53c905bd4dfaddbbf8d.tar.xz forums-52b1a9d4fa877bc6633ec53c905bd4dfaddbbf8d.zip | |
Merge branch '3.1.x' into 3.2.x
| -rw-r--r-- | phpBB/docs/events.md | 7 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_header.html | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 80271c6419..39ef193f4d 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -1343,6 +1343,13 @@ overall_header_page_body_before * Since: 3.1.0-b3 * Purpose: Add content after the page-header, but before the page-body +overall_header_searchbox_after +=== +* Locations: + + styles/prosilver/template/overall_header.html +* Since: 3.1.11-RC1 +* Purpose: Add content after the search box in the header + overall_header_searchbox_before === * Locations: diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 4e4edcb396..4a31a0adde 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -103,6 +103,7 @@ </form> </div> <!-- ENDIF --> + <!-- EVENT overall_header_searchbox_after --> </div> <!-- EVENT overall_header_headerbar_after --> |