1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-02 14:57:37 +02:00

Merge branch '3.1.x' into 3.2.x

This commit is contained in:
Marc Alexander
2016-12-17 23:39:03 +01:00
2 changed files with 8 additions and 0 deletions

View File

@@ -1973,6 +1973,13 @@ ucp_pm_viewmessage_custom_fields_before
* Purpose: Add data before the custom fields on the user profile when viewing * Purpose: Add data before the custom fields on the user profile when viewing
a private message 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 ucp_pm_viewmessage_post_buttons_after
=== ===
* Locations: * Locations:

View File

@@ -167,6 +167,7 @@
</div> </div>
</div> </div>
<!-- EVENT ucp_pm_viewmessage_options_before -->
<!-- IF S_VIEW_MESSAGE --> <!-- IF S_VIEW_MESSAGE -->
<fieldset class="display-options"> <fieldset class="display-options">