diff options
| author | Alan <asinshesq@code.phpbb.com> | 2011-10-13 19:17:56 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-10-13 19:17:56 +0200 |
| commit | f7c1341402ea47cc33ac183421485db3efd7ea15 (patch) | |
| tree | 1f11a3b44aaa390d2faa221cd21beefeda00db0c /phpBB/includes/functions_privmsgs.php | |
| parent | b957639abb4eba00b840092e60fffbc36a9db84c (diff) | |
| download | forums-f7c1341402ea47cc33ac183421485db3efd7ea15.tar forums-f7c1341402ea47cc33ac183421485db3efd7ea15.tar.gz forums-f7c1341402ea47cc33ac183421485db3efd7ea15.tar.bz2 forums-f7c1341402ea47cc33ac183421485db3efd7ea15.tar.xz forums-f7c1341402ea47cc33ac183421485db3efd7ea15.zip | |
[ticket/8616] Direct links in pm notification emails
Import the "Direct links in pm notification emails" modification,
version 1.0.1.
PHPBB3-8616
Diffstat (limited to 'phpBB/includes/functions_privmsgs.php')
| -rw-r--r-- | phpBB/includes/functions_privmsgs.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 4c34bc92ca..a857109466 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -1607,7 +1607,7 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true) // Send Notifications if ($mode != 'edit') { - pm_notification($mode, $data['from_username'], $recipients, $subject, $data['message']); + pm_notification($mode, $data['from_username'], $recipients, $subject, $data['message'], $data['msg_id']); } return $data['msg_id']; @@ -1616,7 +1616,7 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true) /** * PM Notification */ -function pm_notification($mode, $author, $recipients, $subject, $message) +function pm_notification($mode, $author, $recipients, $subject, $message, $msg_id) { global $db, $user, $config, $phpbb_root_path, $phpEx, $auth; @@ -1688,7 +1688,7 @@ function pm_notification($mode, $author, $recipients, $subject, $message) 'AUTHOR_NAME' => htmlspecialchars_decode($author), 'USERNAME' => htmlspecialchars_decode($addr['name']), - 'U_INBOX' => generate_board_url() . "/ucp.$phpEx?i=pm&folder=inbox") + 'U_INBOX' => generate_board_url() . "/ucp.$phpEx?i=pm&mode=view&p=$msg_id") ); $messenger->send($addr['method']); |