diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-10-16 21:20:58 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-10-16 21:20:58 -0400 |
| commit | f0544c884f6862e41bf35e6bd89db5849aa74e9f (patch) | |
| tree | 624b8a425aead8efcf4ffd67311cab5f390f3845 /phpBB/includes | |
| parent | bef3f9c7e7d4373993eb8d3d76df78685b4e043f (diff) | |
| parent | 9915ed52551b9b11e2cfcadabcb758ab05c6db6b (diff) | |
| download | forums-f0544c884f6862e41bf35e6bd89db5849aa74e9f.tar forums-f0544c884f6862e41bf35e6bd89db5849aa74e9f.tar.gz forums-f0544c884f6862e41bf35e6bd89db5849aa74e9f.tar.bz2 forums-f0544c884f6862e41bf35e6bd89db5849aa74e9f.tar.xz forums-f0544c884f6862e41bf35e6bd89db5849aa74e9f.zip | |
Merge PR #624 branch 'nickvergessen/ticket/8743' into develop-olympus
* nickvergessen/ticket/8743:
[ticket/8743] Include poster´s name in mail notifications
Diffstat (limited to 'phpBB/includes')
| -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 aa15593a19..a1029ab97a 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -1169,7 +1169,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; @@ -1340,6 +1340,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", @@ -2602,7 +2603,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 = ''; |