makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 05:48:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
# By Oliver Schramm
# Via Dhruv (1) and Oliver Schramm (1)
* develop-ascraeus:
  [ticket/12674] Use user's colour in 'Last edited' line in sent PMs
This commit is contained in:
Dhruv 2014-07-01 00:36:45 +05:30
commit a99725d27c
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/includes/ucp/ucp_pm_viewmessage.php
View file

@ -85,7 +85,16 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
// Editing information
if ($message_row['message_edit_count'] && $config['display_last_edited'])
{
$l_edited_by = '<br /><br />' . $user->lang('EDITED_TIMES_TOTAL', (int) $message_row['message_edit_count'], (!$message_row['message_edit_user']) ? $message_row['username'] : $message_row['message_edit_user'], $user->format_date($message_row['message_edit_time'], false, true));
if (!$message_row['message_edit_user'])
{
$display_username = get_username_string('full', $author_id, $user_info['username'], $user_info['user_colour']);
}
else
{
$edit_user_info = get_user_information($message_row['message_edit_user'], false);
$display_username = get_username_string('full', $message_row['message_edit_user'], $edit_user_info['username'], $edit_user_info['user_colour']);
}
$l_edited_by = '<br /><br />' . $user->lang('EDITED_TIMES_TOTAL', (int) $message_row['message_edit_count'], $display_username, $user->format_date($message_row['message_edit_time'], false, true));
}
else
{