makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 10:58:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/9657] Include poster name in "deleted post" message

Browse source 
Also switched from passive to active form

PHPBB3-9657
This commit is contained in:
Joas Schilling 2013-03-11 12:22:47 +01:00
parent 8b24ccb894
commit cd95d3abf7
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/language/en/common.php
View file

@ -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',

8
phpBB/viewtopic.php
View file

@ -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));
}