diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2012-03-15 16:07:14 +0100 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2012-03-15 16:07:14 +0100 |
commit | 9915ed52551b9b11e2cfcadabcb758ab05c6db6b (patch) | |
tree | 40a1f6454287f8cea162511a347d78a0859f9fdd /phpBB/includes/functions_posting.php | |
parent | 4b2690f792d330622fd5409ded5f163db1b97bd9 (diff) | |
download | forums-9915ed52551b9b11e2cfcadabcb758ab05c6db6b.tar forums-9915ed52551b9b11e2cfcadabcb758ab05c6db6b.tar.gz forums-9915ed52551b9b11e2cfcadabcb758ab05c6db6b.tar.bz2 forums-9915ed52551b9b11e2cfcadabcb758ab05c6db6b.tar.xz forums-9915ed52551b9b11e2cfcadabcb758ab05c6db6b.zip |
[ticket/8743] Include poster“s name in mail notifications
PHPBB3-8743
Diffstat (limited to 'phpBB/includes/functions_posting.php')
-rw-r--r-- | phpBB/includes/functions_posting.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 77d92e26e2..be3aa844fe 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -1160,7 +1160,7 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id /** * User Notification */ -function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id, $topic_id, $post_id) +function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id, $topic_id, $post_id, $author_name = '') { global $db, $user, $config, $phpbb_root_path, $phpEx, $auth; @@ -1323,6 +1323,7 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id 'USERNAME' => htmlspecialchars_decode($addr['name']), 'TOPIC_TITLE' => htmlspecialchars_decode($topic_title), 'FORUM_NAME' => htmlspecialchars_decode($forum_name), + 'AUTHOR_NAME' => htmlspecialchars_decode($author_name), 'U_FORUM' => generate_board_url() . "/viewforum.$phpEx?f=$forum_id", 'U_TOPIC' => generate_board_url() . "/viewtopic.$phpEx?f=$forum_id&t=$topic_id", @@ -2585,7 +2586,8 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u // Send Notifications if (($mode == 'reply' || $mode == 'quote' || $mode == 'post') && $post_approval) { - user_notification($mode, $subject, $data['topic_title'], $data['forum_name'], $data['forum_id'], $data['topic_id'], $data['post_id']); + $username = ($username) ? $username : $user->data['username']; + user_notification($mode, $subject, $data['topic_title'], $data['forum_name'], $data['forum_id'], $data['topic_id'], $data['post_id'], $username); } $params = $add_anchor = ''; |