aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2015-04-06 14:42:59 +0200
committerJoas Schilling <nickvergessen@gmx.de>2015-04-06 14:42:59 +0200
commitb16a56394bae0cac0a8e5df9d4e460b1c30cb752 (patch)
treed6a8b9afcb6bffa95fc36f45e19846edbfa1c7c0
parent7d08bf5b3eab62cdb6ef29d4d3a780e92ced3b27 (diff)
parent0a52d732e4321d8b5375fd14461db9c463ad5af3 (diff)
downloadforums-b16a56394bae0cac0a8e5df9d4e460b1c30cb752.tar
forums-b16a56394bae0cac0a8e5df9d4e460b1c30cb752.tar.gz
forums-b16a56394bae0cac0a8e5df9d4e460b1c30cb752.tar.bz2
forums-b16a56394bae0cac0a8e5df9d4e460b1c30cb752.tar.xz
forums-b16a56394bae0cac0a8e5df9d4e460b1c30cb752.zip
Merge pull request #3488 from Crizz0/ticket/13701
[ticket/13701] Adds two new events to posting_pm_layout.html Conflicts: phpBB/docs/events.md
-rw-r--r--phpBB/docs/events.md14
-rw-r--r--phpBB/styles/prosilver/template/posting_pm_layout.html2
2 files changed, 16 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 28f8cf7bf0..a7756c96e5 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -984,6 +984,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>