diff options
author | Marc Alexander <admin@m-a-styles.de> | 2017-04-26 19:30:50 -0400 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2017-04-26 19:30:50 -0400 |
commit | 5cafff36b2d932791aa50b1ed30eca5cfcf3742c (patch) | |
tree | ba8bebb3133c2c723b745882367b32f053c941cf | |
parent | a1167629740186e07358269239d91f801800e54a (diff) | |
parent | 4c58dfc19a8cecfa1997b59e240d0729396e2562 (diff) | |
download | forums-5cafff36b2d932791aa50b1ed30eca5cfcf3742c.tar forums-5cafff36b2d932791aa50b1ed30eca5cfcf3742c.tar.gz forums-5cafff36b2d932791aa50b1ed30eca5cfcf3742c.tar.bz2 forums-5cafff36b2d932791aa50b1ed30eca5cfcf3742c.tar.xz forums-5cafff36b2d932791aa50b1ed30eca5cfcf3742c.zip |
Merge branch '3.1.x' into 3.2.x
-rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 06f76aa01a..86cdb090c8 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -449,6 +449,17 @@ function compose_pm($id, $mode, $action, $user_folders = array()) $message_attachment = 0; $message_text = $message_subject = ''; + /** + * Predefine message text and subject + * + * @event core.ucp_pm_compose_predefined_message + * @var string message_text Message text + * @var string message_subject Messate subject + * @since 3.1.11-RC1 + */ + $vars = array('message_text', 'message_subject'); + extract($phpbb_dispatcher->trigger_event('core.ucp_pm_compose_predefined_message', compact($vars))); + if ($to_user_id && $to_user_id != ANONYMOUS && $action == 'post') { $address_list['u'][$to_user_id] = 'to'; |