diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-04-06 14:43:11 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-04-06 14:43:11 +0200 |
| commit | 4ce0d88ffd8e3878e20493ec3fd4153cecdab6d7 (patch) | |
| tree | 14c0e51e16ea5f53daaafd16979510f846cf5d69 | |
| parent | 370fce1651d82dc208d46453524e9aa05162764e (diff) | |
| parent | b16a56394bae0cac0a8e5df9d4e460b1c30cb752 (diff) | |
| download | forums-4ce0d88ffd8e3878e20493ec3fd4153cecdab6d7.tar forums-4ce0d88ffd8e3878e20493ec3fd4153cecdab6d7.tar.gz forums-4ce0d88ffd8e3878e20493ec3fd4153cecdab6d7.tar.bz2 forums-4ce0d88ffd8e3878e20493ec3fd4153cecdab6d7.tar.xz forums-4ce0d88ffd8e3878e20493ec3fd4153cecdab6d7.zip | |
Merge branch '3.1.x'
| -rw-r--r-- | phpBB/docs/events.md | 14 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/posting_pm_layout.html | 2 |
2 files changed, 16 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index a0887e71e6..3be35cfc0c 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -903,6 +903,20 @@ posting_pm_header_find_username_before * Since: 3.1.0-RC4 * Purpose: Add content before the find username link on composing pm +posting_pm_layout_include_pm_header_after +=== +* Locations: + + styles/prosilver/template/posting_pm_layout.html +* Since: 3.1.4-RC1 +* Purpose: Add content after the include of posting_pm_header.html + +posting_pm_layout_include_pm_header_before +=== +* Locations: + + styles/prosilver/template/posting_pm_layout.html +* Since: 3.1.4-RC1 +* Purpose: Add content before the include of posting_pm_header.html + posting_poll_body_options_after === * Locations: diff --git a/phpBB/styles/prosilver/template/posting_pm_layout.html b/phpBB/styles/prosilver/template/posting_pm_layout.html index 3bdadd06ca..7f4a0ea8d7 100644 --- a/phpBB/styles/prosilver/template/posting_pm_layout.html +++ b/phpBB/styles/prosilver/template/posting_pm_layout.html @@ -19,7 +19,9 @@ <div class="panel" id="pmheader-postingbox"> <div class="inner"> + <!-- EVENT posting_pm_layout_include_pm_header_before --> <!-- INCLUDE posting_pm_header.html --> + <!-- EVENT posting_pm_layout_include_pm_header_after --> </div> </div> |