diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-09-02 12:30:10 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-09-02 12:30:10 +0200 |
| commit | 68555d2d513a6a8721777382a8cc8e4633e18cd3 (patch) | |
| tree | c878449919a0a2664e59c538f1355916281c3e59 /phpBB/includes/functions_posting.php | |
| parent | fe12093ddf39f8ec0570c2bca6808b31c93ed4eb (diff) | |
| parent | 5ab378f1ee34951c0683751d07cb8cca8a9a7bd1 (diff) | |
| download | forums-68555d2d513a6a8721777382a8cc8e4633e18cd3.tar forums-68555d2d513a6a8721777382a8cc8e4633e18cd3.tar.gz forums-68555d2d513a6a8721777382a8cc8e4633e18cd3.tar.bz2 forums-68555d2d513a6a8721777382a8cc8e4633e18cd3.tar.xz forums-68555d2d513a6a8721777382a8cc8e4633e18cd3.zip | |
Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
[ticket/11769] Allow using 0 as poster name
[ticket/11769] Allow '0' as username
[ticket/11769] Allow '0' as username in notification mails
[ticket/11769] Fix language issues in the doc blocks
[ticket/11769] Correctly supply the post author's username in posting.php
Conflicts:
phpBB/language/en/email/forum_notify.txt
phpBB/language/en/email/newtopic_notify.txt
phpBB/language/en/email/topic_notify.txt
Diffstat (limited to 'phpBB/includes/functions_posting.php')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 2e5130c5b8..11a5067ef9 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -2604,7 +2604,10 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u // Send Notifications if (($mode == 'reply' || $mode == 'quote' || $mode == 'post') && $post_approval) { - $username = ($username) ? $username : $user->data['username']; + // If a username was supplied or the poster is a guest, we will use the supplied username. + // Doing it this way we can use "...post by guest-username..." in notifications when + // "guest-username" is supplied or ommit the username if it is not. + $username = ($username !== '' || !$user->data['is_registered']) ? $username : $user->data['username']; user_notification($mode, $subject, $data['topic_title'], $data['forum_name'], $data['forum_id'], $data['topic_id'], $data['post_id'], $username); } |