diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-14 13:58:17 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-14 13:58:17 +0100 |
| commit | bdce7abc846a4afc5f0e7bb45e1e2597c3feb909 (patch) | |
| tree | 41c98b046072cd6277e66f4818491b6bc6212740 /phpBB | |
| parent | 943e4e35eef80b9ebe689e6b1933a405575962c3 (diff) | |
| parent | 4333401a279ec3eeee67276f3ea4562674e6a57d (diff) | |
| download | forums-bdce7abc846a4afc5f0e7bb45e1e2597c3feb909.tar forums-bdce7abc846a4afc5f0e7bb45e1e2597c3feb909.tar.gz forums-bdce7abc846a4afc5f0e7bb45e1e2597c3feb909.tar.bz2 forums-bdce7abc846a4afc5f0e7bb45e1e2597c3feb909.tar.xz forums-bdce7abc846a4afc5f0e7bb45e1e2597c3feb909.zip | |
Merge remote-tracking branch 'marcosbc/ticket/12247' into develop-olympus
* marcosbc/ticket/12247:
[ticket/12247] Makes static usernames work
[ticket/12247] Add ['username'] to mcp_queue.php's user_notification()
Diffstat (limited to 'phpBB')
| -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 764461fa53..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); + 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); + 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); } } |