diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-12-17 23:39:03 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-12-17 23:39:03 +0100 |
| commit | 5ecd9fb775c83f9825363ae39dbc653585b1b1e4 (patch) | |
| tree | 5d9a8a33abd0cc2b4a2cb2fee568ca947c26d3b9 /phpBB | |
| parent | 544c7c4e0864df7ad1748c21b92a146e84308a06 (diff) | |
| parent | b6ea3383098756d5905af9ef1cad98056588ea76 (diff) | |
| download | forums-5ecd9fb775c83f9825363ae39dbc653585b1b1e4.tar forums-5ecd9fb775c83f9825363ae39dbc653585b1b1e4.tar.gz forums-5ecd9fb775c83f9825363ae39dbc653585b1b1e4.tar.bz2 forums-5ecd9fb775c83f9825363ae39dbc653585b1b1e4.tar.xz forums-5ecd9fb775c83f9825363ae39dbc653585b1b1e4.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/events.md | 7 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_pm_viewmessage.html | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index aeea2d72a7..d33163ad84 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -1973,6 +1973,13 @@ ucp_pm_viewmessage_custom_fields_before * Purpose: Add data before the custom fields on the user profile when viewing a private message +ucp_pm_viewmessage_options_before +=== +* Locations: + + styles/prosilver/template/ucp_pm_viewmessage.html +* Since: 3.1.11-RC1 +* Purpose: Add content right before display options + ucp_pm_viewmessage_post_buttons_after === * Locations: diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index 59317da8f7..e2a086060c 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -167,6 +167,7 @@ </div> </div> +<!-- EVENT ucp_pm_viewmessage_options_before --> <!-- IF S_VIEW_MESSAGE --> <fieldset class="display-options"> |