diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2014-07-01 00:36:45 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2014-07-01 00:36:45 +0530 |
| commit | a99725d27cd32e3bb827b6eb330a1149a6151954 (patch) | |
| tree | ddc1a5bb72ff5ed6dadddd9e35dc5099669e3502 | |
| parent | edc07c9f9ddfbed638f1aa1e1fbc12d9fb04b96b (diff) | |
| parent | 54a143c9685987a309ae67f09e49424dbf0986c1 (diff) | |
| download | forums-a99725d27cd32e3bb827b6eb330a1149a6151954.tar forums-a99725d27cd32e3bb827b6eb330a1149a6151954.tar.gz forums-a99725d27cd32e3bb827b6eb330a1149a6151954.tar.bz2 forums-a99725d27cd32e3bb827b6eb330a1149a6151954.tar.xz forums-a99725d27cd32e3bb827b6eb330a1149a6151954.zip | |
Merge branch 'develop-ascraeus' into develop
# 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
| -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 { |