diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-09-02 12:28:33 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-09-02 12:28:33 +0200 |
| commit | 5ab378f1ee34951c0683751d07cb8cca8a9a7bd1 (patch) | |
| tree | 309522ce90a89c6551a56082023df5017094e98b /phpBB/includes | |
| parent | ba9d303d525e3b8a12748da02080e3cbc6644a3b (diff) | |
| parent | cd9711b7c9201fa58ce56e56f85aa2c196bcbdae (diff) | |
| download | forums-5ab378f1ee34951c0683751d07cb8cca8a9a7bd1.tar forums-5ab378f1ee34951c0683751d07cb8cca8a9a7bd1.tar.gz forums-5ab378f1ee34951c0683751d07cb8cca8a9a7bd1.tar.bz2 forums-5ab378f1ee34951c0683751d07cb8cca8a9a7bd1.tar.xz forums-5ab378f1ee34951c0683751d07cb8cca8a9a7bd1.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/11769' into prep-release-3.0.12
* nickvergessen/ticket/11769:
[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
Diffstat (limited to 'phpBB/includes')
| -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); } |