aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-07-16 08:35:12 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-07-16 08:35:12 +0200
commite6e54430b9560aaa6fafd73a5fc688795945d737 (patch)
tree9d35960bd4de5657a649d453768f485a91eefbcc /phpBB/includes
parentf1df8e2688bb9765833c18d90302a2f918646929 (diff)
parentb002948e211e480023884ec887e69709fccbb9e4 (diff)
downloadforums-e6e54430b9560aaa6fafd73a5fc688795945d737.tar
forums-e6e54430b9560aaa6fafd73a5fc688795945d737.tar.gz
forums-e6e54430b9560aaa6fafd73a5fc688795945d737.tar.bz2
forums-e6e54430b9560aaa6fafd73a5fc688795945d737.tar.xz
forums-e6e54430b9560aaa6fafd73a5fc688795945d737.zip
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/ucp/ucp_pm_viewmessage.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index 44564ed562..3de3410ea8 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -266,7 +266,9 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
* @var array message_row Array with message data
* @var array cp_row Array with senders custom profile field data
* @var array msg_data Template array with message data
+ * @var array user_info User data of the sender
* @since 3.1.0-a1
+ * @changed 3.1.6-RC1 Added user_info into event
*/
$vars = array(
'id',
@@ -277,6 +279,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
'message_row',
'cp_row',
'msg_data',
+ 'user_info',
);
extract($phpbb_dispatcher->trigger_event('core.ucp_pm_view_messsage', compact($vars)));