aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2012-10-17 15:23:16 +0200
committerJoas Schilling <nickvergessen@gmx.de>2012-10-17 15:23:16 +0200
commit2adb37049e8c7eab5fa762a8968605a8f608aaa8 (patch)
tree879683e1221749bb5934030dc24b378719b15a42 /phpBB/includes
parent43d041bdecb5e564ad48efdf4702cad3714c7837 (diff)
downloadforums-2adb37049e8c7eab5fa762a8968605a8f608aaa8.tar
forums-2adb37049e8c7eab5fa762a8968605a8f608aaa8.tar.gz
forums-2adb37049e8c7eab5fa762a8968605a8f608aaa8.tar.bz2
forums-2adb37049e8c7eab5fa762a8968605a8f608aaa8.tar.xz
forums-2adb37049e8c7eab5fa762a8968605a8f608aaa8.zip
[feature/soft-delete] Display guest username in topic list instead of "Guest"
PHPBB3-9567
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/mcp/mcp_queue.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 5e7c53c8de..bf34c7c53c 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -417,7 +417,7 @@ class mcp_queue
{
if (empty($row['post_username']))
{
- $row['post_username'] = $user->lang['GUEST'];
+ $row['post_username'] = $row['username'] ?: $user->lang['GUEST'];
}
$template->assign_block_vars('postrow', array(
@@ -747,7 +747,7 @@ class mcp_queue
'USERNAME' => htmlspecialchars_decode($topic_data['username']),
'TOPIC_TITLE' => htmlspecialchars_decode(censor_text($topic_data['topic_title'])),
'U_VIEW_TOPIC' => generate_board_url() . "/viewtopic.$phpEx?f={$topic_data['forum_id']}&t={$topic_data['topic_id']}&e=0",
- );
+ ));
$messenger->send($topic_data['user_notify_type']);
}