diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2014-06-29 23:58:24 +0200 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2014-06-30 00:01:14 +0200 |
| commit | 6d1403cb132a86da94052bb80caff942e43f93ca (patch) | |
| tree | ed361e37d11bc4f102a80bfa9c948414fae53cff /phpBB | |
| parent | 5652f33ccca36b093a20033f17cb42ec79a581da (diff) | |
| download | forums-6d1403cb132a86da94052bb80caff942e43f93ca.tar forums-6d1403cb132a86da94052bb80caff942e43f93ca.tar.gz forums-6d1403cb132a86da94052bb80caff942e43f93ca.tar.bz2 forums-6d1403cb132a86da94052bb80caff942e43f93ca.tar.xz forums-6d1403cb132a86da94052bb80caff942e43f93ca.zip | |
[ticket/12674] Use user's colour in 'Last edited' line in sent PMs
PHPBB3-12674
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewmessage.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index f42200d249..94383b935f 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -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 { |