diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-13 20:34:53 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-13 20:34:53 +0100 |
| commit | 1b003fd244a9377731f118b62850861210d0a9b0 (patch) | |
| tree | ff313a530379df6d623604af1b2d39975cdeb16c /phpBB/includes/functions_privmsgs.php | |
| parent | d3a1b670bd555c33ccbea4c7f58ac404e294381b (diff) | |
| parent | 0a5d2a84d158e23b1d2e724d569c183bb049892e (diff) | |
| download | forums-1b003fd244a9377731f118b62850861210d0a9b0.tar forums-1b003fd244a9377731f118b62850861210d0a9b0.tar.gz forums-1b003fd244a9377731f118b62850861210d0a9b0.tar.bz2 forums-1b003fd244a9377731f118b62850861210d0a9b0.tar.xz forums-1b003fd244a9377731f118b62850861210d0a9b0.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/8616] Include old U_INBOX var for BC
[ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE
[ticket/8616] Direct links in pm notification emails
Diffstat (limited to 'phpBB/includes/functions_privmsgs.php')
| -rw-r--r-- | phpBB/includes/functions_privmsgs.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 32b57a9f2e..d90e321285 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -1652,7 +1652,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']; @@ -1661,7 +1661,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; @@ -1733,8 +1733,9 @@ 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&folder=inbox", + 'U_VIEW_MESSAGE' => generate_board_url() . "/ucp.$phpEx?i=pm&mode=view&p=$msg_id", + )); $messenger->send($addr['method']); } |