diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-03-11 12:22:47 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-03-11 12:22:47 +0100 |
| commit | cd95d3abf73d954618b370d6b20f9de86e267ba7 (patch) | |
| tree | d0df8141a5eedfbfb0f017ceb612e0e6a6d6e591 /phpBB | |
| parent | 8b24ccb894b2ec515b4bed3c582b215d1d6baab9 (diff) | |
| download | forums-cd95d3abf73d954618b370d6b20f9de86e267ba7.tar forums-cd95d3abf73d954618b370d6b20f9de86e267ba7.tar.gz forums-cd95d3abf73d954618b370d6b20f9de86e267ba7.tar.bz2 forums-cd95d3abf73d954618b370d6b20f9de86e267ba7.tar.xz forums-cd95d3abf73d954618b370d6b20f9de86e267ba7.zip | |
[ticket/9657] Include poster name in "deleted post" message
Also switched from passive to active form
PHPBB3-9657
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/language/en/common.php | 4 | ||||
| -rw-r--r-- | phpBB/viewtopic.php | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 51862830cd..5ca685a8be 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -517,8 +517,8 @@ $lang = array_merge($lang, array( 'POST_DISPLAY' => '%1$sDisplay this post%2$s.', 'POST_DAY' => '%.2f posts per day', 'POST_DELETED' => 'Deleted post:', - 'POST_DELETED_BY' => 'This post was deleted by <strong>%1$s</strong> on %2$s.', - 'POST_DELETED_BY_REASON'=> 'This post was deleted by <strong>%1$s</strong> on %2$s for reason: %3$s', + 'POST_DELETED_BY' => '<strong>%2$s</strong> deleted the post by <strong>%1$s</strong> on %3$s.', + 'POST_DELETED_BY_REASON'=> '<strong>%2$s</strong> deleted the post by <strong>%1$s</strong> on %3$s for the following reason: %4$s', 'POST_DETAILS' => 'Post details', 'POST_NEW_TOPIC' => 'Post new topic', 'POST_PCT' => '%.2f%% of all posts', diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index c192bb28d9..69da62cecd 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1538,10 +1538,12 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) $user_cache[$row['post_delete_user']] = $post_delete_list[$row['post_delete_user']]; } + $display_postername = get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']); + // User having deleted the post also being the post author? if (!$row['post_delete_user'] || $row['post_delete_user'] == $poster_id) { - $display_username = get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']); + $display_username = $display_postername; } else { @@ -1550,11 +1552,11 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) if ($row['post_delete_reason']) { - $l_deleted_message = $user->lang('POST_DELETED_BY_REASON', $display_username, $user->format_date($row['post_delete_time'], false, true), $row['post_delete_reason']); + $l_deleted_message = $user->lang('POST_DELETED_BY_REASON', $display_postername, $display_username, $user->format_date($row['post_delete_time'], false, true), $row['post_delete_reason']); } else { - $l_deleted_message = $user->lang('POST_DELETED_BY', $display_username, $user->format_date($row['post_delete_time'], false, true)); + $l_deleted_message = $user->lang('POST_DELETED_BY', $display_postername, $display_username, $user->format_date($row['post_delete_time'], false, true)); } $l_deleted_by = $user->lang('DELETED_INFORMATION', $display_username, $user->format_date($row['post_delete_time'], false, true)); } |