1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 2e5130c5b8..aff7129fce 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 use the supplied username.
+		// This way we will use "...post by guest-username..." in notifications,
+		// when guest-username was supplied and ommit the username-part otherwise.
+		$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);
 	}