diff options
| author | Marcos Bjorkelund <marcosbjorkelund@gmail.com> | 2014-03-14 00:28:24 +0100 |
|---|---|---|
| committer | Marcos Bjorkelund <marcosbjorkelund@gmail.com> | 2014-03-14 00:49:20 +0100 |
| commit | 4333401a279ec3eeee67276f3ea4562674e6a57d (patch) | |
| tree | 31df6e3acc2f5e3c56bf66df7203a023c4f048a4 | |
| parent | b322cb4c11d2771e430f7288825578d25f7d463f (diff) | |
| download | forums-4333401a279ec3eeee67276f3ea4562674e6a57d.tar forums-4333401a279ec3eeee67276f3ea4562674e6a57d.tar.gz forums-4333401a279ec3eeee67276f3ea4562674e6a57d.tar.bz2 forums-4333401a279ec3eeee67276f3ea4562674e6a57d.tar.xz forums-4333401a279ec3eeee67276f3ea4562674e6a57d.zip | |
[ticket/12247] Makes static usernames work
Relative to the last ticket, this allows static usernames to
work correctly (those inserted in the post-column post_username)
when sending the e-mail, instead of showing just "Anonymous".
PHPBB3-12247
| -rw-r--r-- | phpBB/includes/mcp/mcp_queue.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index ad6282f637..acf344fd3c 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -660,15 +660,17 @@ function approve_post($post_id_list, $id, $mode) foreach ($post_info as $post_id => $post_data) { + $username = ($post_data['post_username']) ? $post_data['post_username'] : $post_data['username']; + if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id']) { // Forum Notifications - user_notification('post', $post_data['topic_title'], $post_data['topic_title'], $post_data['forum_name'], $post_data['forum_id'], $post_data['topic_id'], $post_id, $post_data['username']); + user_notification('post', $post_data['topic_title'], $post_data['topic_title'], $post_data['forum_name'], $post_data['forum_id'], $post_data['topic_id'], $post_id, $username); } else { // Topic Notifications - user_notification('reply', $post_data['post_subject'], $post_data['topic_title'], $post_data['forum_name'], $post_data['forum_id'], $post_data['topic_id'], $post_id, $post_data['username']); + user_notification('reply', $post_data['post_subject'], $post_data['topic_title'], $post_data['forum_name'], $post_data['forum_id'], $post_data['topic_id'], $post_id, $username); } } |